Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 75d2c0eac7a320a06ac1173045606fbd4bfbff72 https://github.com/galaxyproject/galaxy/commit/75d2c0eac7a320a06ac1173045606... Author: John Chilton jmchilton@gmail.com Date: 2016-08-31 (Wed, 31 Aug 2016)

Changed paths: M lib/galaxy/tools/deps/resolvers/conda.py A lib/galaxy/util/filelock.py M lib/galaxy/web/proxy/__init__.py R lib/galaxy/web/proxy/filelock.py

Log Message: ----------- Refactor - move filelock.py to galaxy.util.

galaxy.tools.deps.resolvers.conda should not depend on galaxy.web.proxy - this is a smell that indicates filelock belongs in galaxy.util IMO.

Commit: 55cd6d86333b63747c257911a16a68a42bb34828 https://github.com/galaxyproject/galaxy/commit/55cd6d86333b63747c257911a16a6... Author: Martin Cech cech.marten@gmail.com Date: 2016-09-01 (Thu, 01 Sep 2016)

Changed paths: M lib/galaxy/tools/deps/resolvers/conda.py A lib/galaxy/util/filelock.py M lib/galaxy/web/proxy/__init__.py R lib/galaxy/web/proxy/filelock.py

Log Message: ----------- Merge pull request #2879 from jmchilton/refactor_filelock

Refactor - move filelock.py to galaxy.util.

Compare: https://github.com/galaxyproject/galaxy/compare/3908a9a8361d...55cd6d86333b