Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 61a11341f9eb5f18ac33bd88e6acefc37a6f46af https://github.com/galaxyproject/galaxy/commit/61a11341f9eb5f18ac33bd88e6ace... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-07-08 (Fri, 08 Jul 2016)

Changed paths: M scripts/common_startup.sh

Log Message: ----------- When CONDA_ALREADY_INSTALLED is undefined there's an error due to the number of arguments in the boolean expression (we actually *do* always want a 1 or 0 there, never empty)

Commit: 77f547ed89a90e31df6e388e311bef29d18f2e65 https://github.com/galaxyproject/galaxy/commit/77f547ed89a90e31df6e388e311be... Author: Martin Cech cech.marten@gmail.com Date: 2016-07-08 (Fri, 08 Jul 2016)

Changed paths: M scripts/common_startup.sh

Log Message: ----------- Merge pull request #2599 from dannon/fix_startup_condaskip

When CONDA_ALREADY_INSTALLED is undefined there's an error due to the…

Compare: https://github.com/galaxyproject/galaxy/compare/c0101e011fc3...77f547ed89a9