Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 90c48ff6e314c77da75deab8ca716bf14065d089 https://github.com/galaxyproject/galaxy/commit/90c48ff6e314c77da75deab8ca716... Author: matthdsm <matthias.desmet@ugent.be> Date: 2016-05-03 (Tue, 03 May 2016) Changed paths: M scripts/common_startup.sh Log Message: ----------- update check for Conda env. Commit: ea2e9163d6827de2e1eb4208db205017c0d94dc4 https://github.com/galaxyproject/galaxy/commit/ea2e9163d6827de2e1eb4208db205... Author: matthdsm <matthias.desmet@ugent.be> Date: 2016-05-17 (Tue, 17 May 2016) Changed paths: M scripts/common_startup.sh Log Message: ----------- changed grep statement to match 2 patterns Now matches both "anaconda" and "continuum analytics" Commit: 6fc2ae42cd4fb20daa7c3927fb52834ca5771580 https://github.com/galaxyproject/galaxy/commit/6fc2ae42cd4fb20daa7c3927fb528... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-05-17 (Tue, 17 May 2016) Changed paths: M scripts/common_startup.sh Log Message: ----------- Merge pull request #2295 from matthdsm/patch-4 update check for Conda env. Compare: https://github.com/galaxyproject/galaxy/compare/df2a068a3bc0...6fc2ae42cd4f