Branch: refs/heads/release_17.09 Home: https://github.com/galaxyproject/galaxy Commit: 27c9fff8b9333d67c039cdbd5c7f1840f095633d https://github.com/galaxyproject/galaxy/commit/27c9fff8b9333d67c039cdbd5c7f1... Author: NCEichner norbert.eichner@ur.de Date: 2018-01-11 (Thu, 11 Jan 2018)
Changed paths: M lib/galaxy/tools/deps/conda_util.py
Log Message: ----------- #5187
In order to get rid of the conda error described in #5187 I raised the version number beginning from which conda is allowed to use the '--offline' parameter again to "4.4"
Commit: 201c6ca8812b243d7ff824df58a3b2fd64a88289 https://github.com/galaxyproject/galaxy/commit/201c6ca8812b243d7ff824df58a3b... Author: Dannon Baker dannon.baker@gmail.com Date: 2018-01-11 (Thu, 11 Jan 2018)
Changed paths: M lib/galaxy/tools/deps/conda_util.py
Log Message: ----------- Merge pull request #5298 from nsoranzo/release_17.09_backport_5233
[17.09] Backport #5233
Compare: https://github.com/galaxyproject/galaxy/compare/40f9c6bb858d...201c6ca8812b