Branch: refs/heads/release_16.01 Home: https://github.com/galaxyproject/galaxy Commit: 8ceb4d8ee495d21a664e3faece1e072a88048494 https://github.com/galaxyproject/galaxy/commit/8ceb4d8ee495d21a664e3faece1e0... Author: Nate Coraor nate@bx.psu.edu Date: 2016-01-21 (Thu, 21 Jan 2016)
Changed paths: M scripts/common_startup.sh
Log Message: ----------- Force --skip-venv if we can detect that Python is Conda Python.
Commit: fe96255022f4fdf72f39be959a15993d014a0d38 https://github.com/galaxyproject/galaxy/commit/fe96255022f4fdf72f39be959a159... Author: Björn Grüning bjoern@gruenings.eu Date: 2016-01-21 (Thu, 21 Jan 2016)
Changed paths: M scripts/common_startup.sh
Log Message: ----------- Merge pull request #1554 from natefoo/conda-interop
[16.01] Force --skip-venv if we can detect that Python is Conda Python.
Compare: https://github.com/galaxyproject/galaxy/compare/e48388ef6cca...fe96255022f4