Branch: refs/heads/release_17.05 Home: https://github.com/galaxyproject/galaxy Commit: 414c03124785f194bf46e84c95e20219423f4f16 https://github.com/galaxyproject/galaxy/commit/414c03124785f194bf46e84c95e20... Author: mvdbeek m.vandenbeek@gmail.com Date: 2018-01-29 (Mon, 29 Jan 2018)

Changed paths: M config/galaxy.ini.sample M lib/galaxy/tools/deps/resolvers/conda.py

Log Message: ----------- Follow IUC and Drop r channel from default cond channels

Commit: a70f2875b3b72d3cc50d41ea9120df8c3d03de32 https://github.com/galaxyproject/galaxy/commit/a70f2875b3b72d3cc50d41ea9120d... Author: mvdbeek m.vandenbeek@gmail.com Date: 2018-01-29 (Mon, 29 Jan 2018)

Changed paths: M doc/source/admin/dependency_resolvers.rst M lib/galaxy/tools/deps/mulled/mulled_build.py

Log Message: ----------- Remove r channel from more locations

Commit: 34421966d41a9b9491d3388200c3642c8514b9f1 https://github.com/galaxyproject/galaxy/commit/34421966d41a9b9491d3388200c36... Author: Björn Grüning bjoern@gruenings.eu Date: 2018-01-31 (Wed, 31 Jan 2018)

Changed paths: M config/galaxy.ini.sample M doc/source/admin/dependency_resolvers.rst M lib/galaxy/tools/deps/mulled/mulled_build.py M lib/galaxy/tools/deps/resolvers/conda.py

Log Message: ----------- Merge pull request #5406 from mvdbeek/conda_and_channel_order_update

[17.05] Follow IUC and drop r channel from default conda channels

Compare: https://github.com/galaxyproject/galaxy/compare/4288e96b77fc...34421966d41a