Branch: refs/heads/release_17.05 Home: https://github.com/galaxyproject/galaxy Commit: 3332dfb6717e9bd368341e0bc0aa51d3b53fa861 https://github.com/galaxyproject/galaxy/commit/3332dfb6717e9bd368341e0bc0aa5... Author: John Chilton jmchilton@gmail.com Date: 2017-05-04 (Thu, 04 May 2017)

Changed paths: M lib/galaxy/tools/deps/container_resolvers/explicit.py M lib/galaxy/util/plugin_config.py

Log Message: ----------- [17.05] Fix setting up explicit container resolution from a container resolution config file.

Commit: 0bafd683f152f28a193ee39a415018e4a8952767 https://github.com/galaxyproject/galaxy/commit/0bafd683f152f28a193ee39a41501... Author: Martin Cech marten@bx.psu.edu Date: 2017-05-12 (Fri, 12 May 2017)

Changed paths: M lib/galaxy/tools/deps/container_resolvers/explicit.py M lib/galaxy/util/plugin_config.py

Log Message: ----------- Merge pull request #4020 from jmchilton/fix_explicit_container_resolver_from_config

[17.05] Fix setting up explicit container resolution...

Compare: https://github.com/galaxyproject/galaxy/compare/aa1e4cea148b...0bafd683f152