Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 5818bbcbaaeca54a85bef9acaadd41d12386a6ad https://github.com/galaxyproject/galaxy/commit/5818bbcbaaeca54a85bef9acaadd4... Author: Nate Coraor <nate@bx.psu.edu> Date: 2017-03-03 (Fri, 03 Mar 2017) Changed paths: M config/dependency_resolvers_conf.xml.sample M lib/galaxy/tools/deps/__init__.py Log Message: ----------- Prefer versioned Conda dependencies to unversioned Galaxy ones. Commit: 45971b29bd8b93825fe48134750bd866c82f7a9f https://github.com/galaxyproject/galaxy/commit/45971b29bd8b93825fe48134750bd... Author: Nate Coraor <nate@bx.psu.edu> Date: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M doc/source/admin/dependency_resolvers.rst Log Message: ----------- Update dependency resolver docs for new default order Commit: 33ff2754cc75981796176b7e7ae75ce362db62a0 https://github.com/galaxyproject/galaxy/commit/33ff2754cc75981796176b7e7ae75... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M config/dependency_resolvers_conf.xml.sample M doc/source/admin/dependency_resolvers.rst M lib/galaxy/tools/deps/__init__.py Log Message: ----------- Merge pull request #3708 from natefoo/dep-resolve-order Prefer versioned Conda dependencies to unversioned Galaxy ones Compare: https://github.com/galaxyproject/galaxy/compare/5a7eab0f06b4...33ff2754cc75