Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: b53a9275d54d8ed0373a11a4e95c500619a3d5b0 https://github.com/galaxyproject/galaxy/commit/b53a9275d54d8ed0373a11a4e95c5... Author: remimarenco remi.marenco@gmail.com Date: 2016-07-07 (Thu, 07 Jul 2016)

Changed paths: M scripts/common_startup.sh

Log Message: ----------- Add Warning when Conda is installed because we skip the virtualenv creation

Fix the case where we could have conda not installed but not setting VirtualEnv still (and have this non relevant warning

Commit: de702db55d8f1ca397b4ab926085e006cd39a490 https://github.com/galaxyproject/galaxy/commit/de702db55d8f1ca397b4ab926085e... Author: Remi Marenco remi.marenco@gmail.com Date: 2016-07-07 (Thu, 07 Jul 2016)

Changed paths: M scripts/common_startup.sh

Log Message: ----------- s/creation/activation. Thx @nsoranzo

Commit: c0101e011fc3aacad1533d1bb80fdf4588c6bdb6 https://github.com/galaxyproject/galaxy/commit/c0101e011fc3aacad1533d1bb80fd... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-07-08 (Fri, 08 Jul 2016)

Changed paths: M scripts/common_startup.sh

Log Message: ----------- Merge pull request #2596 from remimarenco/conda_virtualenv_warning

Add Warning when Conda is installed

Compare: https://github.com/galaxyproject/galaxy/compare/83f1b07687a5...c0101e011fc3