Branch: refs/heads/release_16.07 Home: https://github.com/galaxyproject/galaxy Commit: 89278b0ec70b7a8f1cf42bda87335cf4f98f175b https://github.com/galaxyproject/galaxy/commit/89278b0ec70b7a8f1cf42bda87335... Author: John Chilton jmchilton@gmail.com Date: 2016-10-07 (Fri, 07 Oct 2016)
Changed paths: M config/galaxy.ini.sample M doc/source/admin/dependency_resolvers.rst M lib/galaxy/tools/deps/__init__.py M lib/galaxy/tools/deps/resolvers/conda.py
Log Message: ----------- Fix for bioconda recipes depending on conda-forge.
Some bioconda recipes now depend on conda forge, this fix is needed for them to work properly.
Commit: ddacf38a11a9f752b3cfe13a8b63182ff1d02d06 https://github.com/galaxyproject/galaxy/commit/ddacf38a11a9f752b3cfe13a8b631... Author: Björn Grüning bjoern@gruenings.eu Date: 2016-10-10 (Mon, 10 Oct 2016)
Changed paths: M config/galaxy.ini.sample M doc/source/admin/dependency_resolvers.rst M lib/galaxy/tools/deps/__init__.py M lib/galaxy/tools/deps/resolvers/conda.py
Log Message: ----------- Merge pull request #3023 from jmchilton/fix_abyss
[16.07] Fix for bioconda recipes depending on conda-forge.
Compare: https://github.com/galaxyproject/galaxy/compare/f32b6446a7a4...ddacf38a11a9