Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: af948913607b400c6b58dee701a8a23815601b81 https://github.com/galaxyproject/galaxy/commit/af948913607b400c6b58dee701a8a... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-08-22 (Mon, 22 Aug 2016) Changed paths: M lib/galaxy/tools/deps/resolvers/conda.py Log Message: ----------- Acquire lock before attempting to install conda Commit: 84f309a03dd8c20076d81b6137acacc515be7721 https://github.com/galaxyproject/galaxy/commit/84f309a03dd8c20076d81b6137aca... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-08-22 (Mon, 22 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: 57937933fb97e17beee0711d69040e7d0efad180 https://github.com/galaxyproject/galaxy/commit/57937933fb97e17beee0711d69040... Author: John Chilton <jmchilton@gmail.com> Date: 2016-08-24 (Wed, 24 Aug 2016) Changed paths: M lib/galaxy/tools/deps/resolvers/conda.py Log Message: ----------- Merge pull request #2826 from mvdbeek/lock_conda Acquire lock before attempting to install conda Compare: https://github.com/galaxyproject/galaxy/compare/2a92a7de86a7...57937933fb97