Branch: refs/heads/release_17.05 Home: https://github.com/galaxyproject/galaxy Commit: a0c59d8f05c011f6c7b002599ed09c3fe091c340 https://github.com/galaxyproject/galaxy/commit/a0c59d8f05c011f6c7b002599ed09... Author: mvdbeek m.vandenbeek@gmail.com Date: 2017-05-05 (Fri, 05 May 2017)

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

Log Message: ----------- Try activating conda environment again if previous activation failed

Commit: c38c0276afb88ed5b1403ede53ae35247307890d https://github.com/galaxyproject/galaxy/commit/c38c0276afb88ed5b1403ede53ae3... Author: mvdbeek m.vandenbeek@gmail.com Date: 2017-05-07 (Sun, 07 May 2017)

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

Log Message: ----------- Exit with error message when conda environemnt could not be activated (thx @nsoranzo).

Commit: 9e6c1529929132414e240e306d2b244ef6853944 https://github.com/galaxyproject/galaxy/commit/9e6c1529929132414e240e306d2b2... Author: John Chilton jmchilton@gmail.com Date: 2017-05-08 (Mon, 08 May 2017)

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

Log Message: ----------- Merge pull request #4035 from mvdbeek/retry_conda_activation

[17.05] Try activating conda environment again if previous activation failed

Compare: https://github.com/galaxyproject/galaxy/compare/6ef7b9977a3e...9e6c15299291