Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 238d908ccecd6411a3a72f7396933b3771f7e5aa https://github.com/galaxyproject/galaxy/commit/238d908ccecd6411a3a72f7396933... Author: Nicola Soranzo <nicola.soranzo@tgac.ac.uk> Date: 2015-08-19 (Wed, 19 Aug 2015) Changed paths: M lib/galaxy/model/__init__.py M scripts/cleanup_datasets/cleanup_datasets.py Log Message: ----------- Fix purging datasets whose total_size is None. Fix the error: Removing disk, file /opt/galaxy/database/files/000/dataset_192.dat Error attempting to purge data file: /opt/galaxy/database/files/000/dataset_192.dat error: unsupported operand type(s) for -=: 'Decimal' and 'NoneType' when running: python scripts/cleanup_datasets/cleanup_datasets.py config/galaxy.ini -d 10 -3 -r Commit: a9827fae31d8826bf2426c5285fe789dfe61295d https://github.com/galaxyproject/galaxy/commit/a9827fae31d8826bf2426c5285fe7... Author: John Chilton <jmchilton@gmail.com> Date: 2015-08-20 (Thu, 20 Aug 2015) Changed paths: M test/unit/test_galaxy_mapping.py Log Message: ----------- Fix failing tests for 238d908ccecd6411a3a72f7396933b3771f7e5aa. Commit: baf8fe6759fe283516c5242d42ab8274b5a3baf0 https://github.com/galaxyproject/galaxy/commit/baf8fe6759fe283516c5242d42ab8... Author: Nicola Soranzo <nsoranzo@tiscali.it> Date: 2015-08-20 (Thu, 20 Aug 2015) Changed paths: M test/unit/test_galaxy_mapping.py Log Message: ----------- Merge pull request #1 from jmchilton/release_fix Fix failing tests for 238d908ccecd6411a3a72f7396933b3771f7e5aa. Commit: 14a8ee95f3dd8a671ee9a1edac8fc3cd686a4395 https://github.com/galaxyproject/galaxy/commit/14a8ee95f3dd8a671ee9a1edac8fc... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2015-08-20 (Thu, 20 Aug 2015) Changed paths: M lib/galaxy/model/__init__.py M scripts/cleanup_datasets/cleanup_datasets.py M test/unit/test_galaxy_mapping.py Log Message: ----------- Merge pull request #616 from nsoranzo/release_15.05 [15.05] Fix purging datasets whose total_size is None. Commit: a34f13a9f6eb216665ea97e1314f7b76c74c5778 https://github.com/galaxyproject/galaxy/commit/a34f13a9f6eb216665ea97e1314f7... Author: Nicola Soranzo <nicola.soranzo@tgac.ac.uk> Date: 2015-08-20 (Thu, 20 Aug 2015) Changed paths: M lib/galaxy/model/__init__.py M scripts/cleanup_datasets/cleanup_datasets.py M test/unit/test_galaxy_mapping.py Log Message: ----------- Merge branch 'release_15.05' into release_15.07 Commit: 0f883ef776bd71348b82be29221abbbc1751d45f https://github.com/galaxyproject/galaxy/commit/0f883ef776bd71348b82be29221ab... Author: Nicola Soranzo <nicola.soranzo@tgac.ac.uk> Date: 2015-08-20 (Thu, 20 Aug 2015) Changed paths: M lib/galaxy/model/__init__.py M scripts/cleanup_datasets/cleanup_datasets.py M test/unit/test_galaxy_mapping.py Log Message: ----------- Merge branch 'release_15.07' into dev Conflicts: lib/galaxy/model/__init__.py Compare: https://github.com/galaxyproject/galaxy/compare/c429777c9368...0f883ef776bd