Branch: refs/heads/release_16.01 Home: https://github.com/galaxyproject/galaxy Commit: afc5f2a45399c474d86f1530a62afe280a0eb3be https://github.com/galaxyproject/galaxy/commit/afc5f2a45399c474d86f1530a62af... Author: John Chilton jmchilton@gmail.com Date: 2016-02-02 (Tue, 02 Feb 2016)

Changed paths: M lib/galaxy/config.py

Log Message: ----------- Fix: Use dependency resolvers if any config exists.

This way resolvers like the Module resolver work even if tool_dependency_dir is not set.

Commit: 916ddb575f40c445a47cf91a58aad00bf9360ae8 https://github.com/galaxyproject/galaxy/commit/916ddb575f40c445a47cf91a58aad... Author: Daniel Blankenberg dan.blankenberg@gmail.com Date: 2016-02-02 (Tue, 02 Feb 2016)

Changed paths: M lib/galaxy/config.py

Log Message: ----------- Merge pull request #1648 from jmchilton/dependencies_conf

[16.01] Fix use_tool_dependencies for non-default dependency_resolver_conf files.

Compare: https://github.com/galaxyproject/galaxy/compare/e4e48941a617...916ddb575f40