Branch: refs/heads/release_16.07 Home: https://github.com/galaxyproject/galaxy Commit: 8b67ddfa37f82081791bcca5330983a2dd1301f9 https://github.com/galaxyproject/galaxy/commit/8b67ddfa37f82081791bcca533098... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-08-24 (Wed, 24 Aug 2016) Changed paths: M lib/galaxy/tools/deps/resolvers/conda.py Log Message: ----------- Acquire lock before attempting to install conda Commit: a2f234d5661f88263e1e6c5e8edef1e521b55359 https://github.com/galaxyproject/galaxy/commit/a2f234d5661f88263e1e6c5e8edef... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-08-24 (Wed, 24 Aug 2016) Changed paths: M lib/galaxy/tools/deps/resolvers/conda.py Log Message: ----------- Create default tool_dependency dir if it doesn't exist Commit: e9d81500caa3526200b204270aca175839f36f56 https://github.com/galaxyproject/galaxy/commit/e9d81500caa3526200b204270aca1... Author: Bjoern Gruening <bjoern.gruening@gmail.com> Date: 2016-08-24 (Wed, 24 Aug 2016) Changed paths: M lib/galaxy/tools/deps/conda_util.py Log Message: ----------- shorten Conda environment names Commit: fad13d50c344112c8ab637e3c568e43d863730bd https://github.com/galaxyproject/galaxy/commit/fad13d50c344112c8ab637e3c568e... Author: John Chilton <jmchilton@gmail.com> Date: 2016-08-24 (Wed, 24 Aug 2016) Changed paths: M lib/galaxy/tools/deps/conda_util.py M lib/galaxy/tools/deps/resolvers/conda.py Log Message: ----------- Merge pull request #2851 from martenson/backport_2794_2826 [16.07] Backport conda fixes Compare: https://github.com/galaxyproject/galaxy/compare/3248b679ac91...fad13d50c344