Branch: refs/heads/release_16.07 Home: https://github.com/galaxyproject/galaxy Commit: 6d27a3c4b6184b393e535afd32f87e55e7a07b70 https://github.com/galaxyproject/galaxy/commit/6d27a3c4b6184b393e535afd32f87... Author: Marius van den Beek m.vandenbeek@gmail.com Date: 2016-10-05 (Wed, 05 Oct 2016)

Changed paths: M lib/galaxy/tools/deps/conda_util.py

Log Message: ----------- Fix initial conda version at 4.0.5

This should prevent missing `activate` in <conda_prefix>/bin when downgrading to 3.19.3. This is what the conda people use in their CI environment ( [see](https://github.com/conda/conda/blob/master/utils/travis-run-install.sh#L61) and perhaps why that bug made it into the release in the first place).

Commit: f7c3e25e5db1a1d99c81380f552719bee07c1790 https://github.com/galaxyproject/galaxy/commit/f7c3e25e5db1a1d99c81380f55271... Author: Björn Grüning bjoern@gruenings.eu Date: 2016-10-05 (Wed, 05 Oct 2016)

Changed paths: M lib/galaxy/tools/deps/conda_util.py

Log Message: ----------- Merge pull request #3009 from mvdbeek/conda_downgrade

[16.01] Backport #2869 Fix initial conda version at 4.0.5

Commit: 224c2126c73617ec906abc1e08d5f5a7548633b1 https://github.com/galaxyproject/galaxy/commit/224c2126c73617ec906abc1e08d5f... Author: Nicola Soranzo nicola.soranzo@tgac.ac.uk Date: 2016-10-05 (Wed, 05 Oct 2016)

Changed paths: M lib/galaxy/tools/deps/conda_util.py

Log Message: ----------- Merge branch 'release_16.01' into release_16.04

Commit: d6845c249466d013b58ab021540fc5176096aaa0 https://github.com/galaxyproject/galaxy/commit/d6845c249466d013b58ab021540fc... Author: Nicola Soranzo nicola.soranzo@tgac.ac.uk Date: 2016-10-05 (Wed, 05 Oct 2016)

Changed paths: M lib/galaxy/tools/deps/conda_util.py

Log Message: ----------- Merge branch 'release_16.04' into release_16.07

Compare: https://github.com/galaxyproject/galaxy/compare/d9fab3345856...d6845c249466