Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: b1f4a0f61aeb8ddfec26c4b51bf92bdd50606c91 https://github.com/galaxyproject/galaxy/commit/b1f4a0f61aeb8ddfec26c4b51bf92... Author: Marius van den Beek m.vandenbeek@gmail.com Date: 2016-08-29 (Mon, 29 Aug 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: ba6a0a36476cd5db46777e99b84b6440ec6073b0 https://github.com/galaxyproject/galaxy/commit/ba6a0a36476cd5db46777e99b84b6... Author: John Chilton jmchilton@gmail.com Date: 2016-08-30 (Tue, 30 Aug 2016)

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

Log Message: ----------- Merge pull request #2869 from mvdbeek/upgrade_conda_instead_of_downgrading

Fix initial conda version at 4.0.5

Compare: https://github.com/galaxyproject/galaxy/compare/0bd1ea108e7f...ba6a0a36476c