Branch: refs/heads/release_16.07 Home: https://github.com/galaxyproject/galaxy Commit: 6724146e7d09e5c0ac4f19d96e600d14831a8abe https://github.com/galaxyproject/galaxy/commit/6724146e7d09e5c0ac4f19d96e600... Author: John Chilton <jmchilton@gmail.com> Date: 2016-08-26 (Fri, 26 Aug 2016) Changed paths: M lib/galaxy/tools/deps/resolvers/conda.py Log Message: ----------- Fix three conda bugs. - Don't attempt file lock if don't have write access for lock. - Set disabled to False if conda present and auto_init is False. - Use the correct parent path for conda_prefix (if default parent path is overridden). Commit: c01ce21e2cdb7b229dd8ced14e4e2c1c7fdf294c https://github.com/galaxyproject/galaxy/commit/c01ce21e2cdb7b229dd8ced14e4e2... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-08-26 (Fri, 26 Aug 2016) Changed paths: M lib/galaxy/tools/deps/resolvers/conda.py Log Message: ----------- Merge pull request #2864 from jmchilton/conda_fixes [16.07] Fix three conda bugs. Compare: https://github.com/galaxyproject/galaxy/compare/52768c0c4231...c01ce21e2cdb