Branch: refs/heads/release_18.05 Home: https://github.com/galaxyproject/galaxy Commit: fc4bcc0a7e9fc7b01c4a4a069118077d01c236c5 https://github.com/galaxyproject/galaxy/commit/fc4bcc0a7e9fc7b01c4a4a0691180... Author: Nate Coraor nate@bx.psu.edu Date: 2018-04-27 (Fri, 27 Apr 2018)

Changed paths: M lib/galaxy/jobs/runners/slurm.py

Log Message: ----------- Handle Slurm 17.11's OUT_OF_MEMORY job state.

Commit: effd5f92f245f13faa53ceeb41734124d14a0eb8 https://github.com/galaxyproject/galaxy/commit/effd5f92f245f13faa53ceeb41734... Author: Nicola Soranzo nicola.soranzo@earlham.ac.uk Date: 2018-05-14 (Mon, 14 May 2018)

Changed paths: M test/functional/tools/job_properties.xml

Log Message: ----------- Lint job_properties test tool

Commit: 85e5d7fcd3261d3283ff3fa78d0c2b78fe429f4b https://github.com/galaxyproject/galaxy/commit/85e5d7fcd3261d3283ff3fa78d0c2... Author: Nicola Soranzo nicola.soranzo@earlham.ac.uk Date: 2018-05-14 (Mon, 14 May 2018)

Changed paths: M test/api/test_workflows.py

Log Message: ----------- Fix required tools to run workflow API tests

Commit: efb0f02d345cb9a5d415fa4dd9ac1bf8ca507f5d https://github.com/galaxyproject/galaxy/commit/efb0f02d345cb9a5d415fa4dd9ac1... Author: Nicola Soranzo nicola.soranzo@earlham.ac.uk Date: 2018-05-14 (Mon, 14 May 2018)

Changed paths: M lib/galaxy/model/__init__.py M test/api/test_workflows.py

Log Message: ----------- Hide replacement datasets when rerunning a failed dataset in a mapped-over collection

Commit: 4531d80dbcaf5671fdcb56627f3cc948cd710c4e https://github.com/galaxyproject/galaxy/commit/4531d80dbcaf5671fdcb56627f3cc... Author: Nicola Soranzo nicola.soranzo@earlham.ac.uk Date: 2018-05-15 (Tue, 15 May 2018)

Changed paths: M lib/galaxy/tools/actions/__init__.py

Log Message: ----------- When re-running a failed dataset collection element, update JobToOutputDatasetCollectionAssociation to the new job

Otherwise, if re-running fails once, then re-running it again successfully will let the other workflow jobs resume, but the collection element is not replaced and the collection remains red.

Commit: 7532de99c9c64fa92667f80f641984005fd85f01 https://github.com/galaxyproject/galaxy/commit/7532de99c9c64fa92667f80f64198... Author: Dannon dannon.baker@gmail.com Date: 2018-05-15 (Tue, 15 May 2018)

Changed paths: M lib/galaxy/model/__init__.py M lib/galaxy/tools/actions/__init__.py M test/api/test_workflows.py M test/functional/tools/job_properties.xml

Log Message: ----------- Merge pull request #6137 from nsoranzo/release_18.01_fix_workflow_resume_with_mapped_over_input

[18.01] Fixes for workflow resume with mapped over inputs

Commit: ec83035c2a4c7037afd56c615a3f5351d1e7e539 https://github.com/galaxyproject/galaxy/commit/ec83035c2a4c7037afd56c615a3f5... Author: Martin Cech marten@bx.psu.edu Date: 2018-05-15 (Tue, 15 May 2018)

Changed paths: M lib/galaxy/jobs/runners/slurm.py

Log Message: ----------- Merge pull request #6007 from natefoo/slurm-oom

[18.01] Handle Slurm 17.11's OUT_OF_MEMORY job state

Commit: b114b1d6bafc334dc63b08d6654b24bec7ab87d5 https://github.com/galaxyproject/galaxy/commit/b114b1d6bafc334dc63b08d6654b2... Author: Nicola Soranzo nicola.soranzo@earlham.ac.uk Date: 2018-05-16 (Wed, 16 May 2018)

Changed paths: M lib/galaxy/jobs/runners/slurm.py M lib/galaxy/model/__init__.py M lib/galaxy/tools/actions/__init__.py M test/api/test_workflows.py M test/functional/tools/job_properties.xml

Log Message: ----------- Merge branch 'release_18.01' into release_18.05

Compare: https://github.com/galaxyproject/galaxy/compare/3a9a46f772ba...b114b1d6bafc **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

Functionality will be removed from GitHub.com on January 31st, 2019.