Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 4cebca81c677a6692e22006468310d0e21195251 https://github.com/galaxyproject/galaxy/commit/4cebca81c677a6692e22006468310... Author: John Chilton <jmchilton@gmail.com> Date: 2015-10-12 (Mon, 12 Oct 2015) Changed paths: M lib/galaxy/jobs/__init__.py M lib/galaxy/model/__init__.py M test/unit/test_galaxy_mapping.py Log Message: ----------- Redo total disk calculation adjustments to be less race condition-y. ... at least when finishing the job. Method should probably be used other places as well. Commit: b77496ec638e5e15f6cb8b1e83077fdf266634d2 https://github.com/galaxyproject/galaxy/commit/b77496ec638e5e15f6cb8b1e83077... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2015-10-13 (Tue, 13 Oct 2015) Changed paths: M lib/galaxy/managers/hdas.py M lib/galaxy/model/__init__.py M lib/galaxy/web/framework/webapp.py M lib/galaxy/webapps/galaxy/controllers/dataset.py M lib/galaxy/webapps/galaxy/controllers/history.py M scripts/cleanup_datasets/cleanup_datasets.py Log Message: ----------- Update other quota manipulations to use the new user.adjust_quota_usage function. Commit: 3e5b91ceca04bc2ce040617a0ba17ab73d274469 https://github.com/galaxyproject/galaxy/commit/3e5b91ceca04bc2ce040617a0ba17... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2015-10-13 (Tue, 13 Oct 2015) Changed paths: M lib/galaxy/model/__init__.py Log Message: ----------- Remove duplicate func import Commit: c05315c7d38790b5de75f386fab06db0f241212d https://github.com/galaxyproject/galaxy/commit/c05315c7d38790b5de75f386fab06... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2015-10-13 (Tue, 13 Oct 2015) Changed paths: M lib/galaxy/jobs/__init__.py M lib/galaxy/web/framework/webapp.py Log Message: ----------- Avoid overriding 'bytes' type with the local variable. Commit: 005561c22a40d74693318ccfd0c94e41bbd309e0 https://github.com/galaxyproject/galaxy/commit/005561c22a40d74693318ccfd0c94... Author: Daniel Blankenberg <dan.blankenberg@gmail.com> Date: 2015-10-14 (Wed, 14 Oct 2015) Changed paths: M lib/galaxy/jobs/__init__.py M lib/galaxy/managers/hdas.py M lib/galaxy/model/__init__.py M lib/galaxy/web/framework/webapp.py M lib/galaxy/webapps/galaxy/controllers/dataset.py M lib/galaxy/webapps/galaxy/controllers/history.py M scripts/cleanup_datasets/cleanup_datasets.py M test/unit/test_galaxy_mapping.py Log Message: ----------- Merge pull request #907 from dannon/quota_bugfix Quota bugfixes Compare: https://github.com/galaxyproject/galaxy/compare/977ef6b7c7c0...005561c22a40