Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: b3edbcaec785c93171ac5b08805dec3ade92e4b7 https://github.com/galaxyproject/galaxy/commit/b3edbcaec785c93171ac5b08805de... Author: Dave Bouvier <dave@bx.psu.edu> Date: 2016-06-09 (Thu, 09 Jun 2016) Changed paths: M lib/tool_shed/util/repository_util.py Log Message: ----------- Workaround for circular import situation. Commit: 4c6389fb05a50b8b2d8f5f3fb2c9ea635a2bb6a6 https://github.com/galaxyproject/galaxy/commit/4c6389fb05a50b8b2d8f5f3fb2c9e... Author: Dave Bouvier <dave@bx.psu.edu> Date: 2016-06-09 (Thu, 09 Jun 2016) Changed paths: M lib/galaxy/jobs/metrics/instrumenters/collectl.py M lib/galaxy/model/__init__.py M lib/galaxy/objectstore/__init__.py M lib/galaxy/objectstore/s3.py M lib/galaxy/util/__init__.py R lib/galaxy/util/directory_hash.py M lib/galaxy/webapps/tool_shed/model/__init__.py M lib/tool_shed/util/repository_util.py Log Message: ----------- Move directory_hash_id into galaxy/util.py. Use util.directory_hash_id throughout. Commit: 89ba1ddef4706436aa5b2f30a37a8247755ea1a8 https://github.com/galaxyproject/galaxy/commit/89ba1ddef4706436aa5b2f30a37a8... Author: Dave Bouvier <dave@bx.psu.edu> Date: 2016-06-09 (Thu, 09 Jun 2016) Changed paths: M lib/tool_shed/util/repository_util.py Log Message: ----------- Remove now-unused import. Commit: 4da1f6a5eaf1228aa42b0ee7e8d1327a58706602 https://github.com/galaxyproject/galaxy/commit/4da1f6a5eaf1228aa42b0ee7e8d13... Author: John Chilton <jmchilton@gmail.com> Date: 2016-06-09 (Thu, 09 Jun 2016) Changed paths: M lib/galaxy/jobs/metrics/instrumenters/collectl.py M lib/galaxy/model/__init__.py M lib/galaxy/objectstore/__init__.py M lib/galaxy/objectstore/s3.py M lib/galaxy/util/__init__.py R lib/galaxy/util/directory_hash.py M lib/galaxy/webapps/tool_shed/model/__init__.py M lib/tool_shed/util/repository_util.py Log Message: ----------- Merge pull request #2477 from davebx/circular_workaround Workaround for circular import. Refactor. Compare: https://github.com/galaxyproject/galaxy/compare/b7108cfb8b62...4da1f6a5eaf1