Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 04eee6459a8e9f4566da61f819a937f4b04d1c40 https://github.com/galaxyproject/galaxy/commit/04eee6459a8e9f4566da61f819a93... Author: John Chilton <jmchilton@gmail.com> Date: 2017-01-25 (Wed, 25 Jan 2017) Changed paths: M lib/galaxy/tools/deps/resolvers/conda.py M test/unit/tools/test_conda_resolution.py Log Message: ----------- Fix logs and unit tests for Conda placeholder bug resolution. Commit: 71876f6de7d9a92fc482b0ae0c2ed0ad4588b906 https://github.com/galaxyproject/galaxy/commit/71876f6de7d9a92fc482b0ae0c2ed... Author: Martin Cech <cech.marten@gmail.com> Date: 2017-01-25 (Wed, 25 Jan 2017) Changed paths: M lib/galaxy/tools/deps/resolvers/conda.py M test/unit/tools/test_conda_resolution.py Log Message: ----------- Merge pull request #3482 from jmchilton/placeholder_fixes [17.01] Fix logs and unit tests for Conda placeholder bug resolution. Compare: https://github.com/galaxyproject/galaxy/compare/29c0c41666e4...71876f6de7d9