Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 3005bba5e389c86fccabe129326a1f3a675c6911 https://github.com/galaxyproject/galaxy/commit/3005bba5e389c86fccabe129326a1... Author: Lance Parsons <lparsons@genomics.princeton.edu> Date: 2016-05-04 (Wed, 04 May 2016) Changed paths: M lib/galaxy/jobs/runners/slurm.py Log Message: ----------- Remove SLURM memory limit warning from stderr if the job was successful Commit: d40c237102115c1a4e664b8463ef1949a3741387 https://github.com/galaxyproject/galaxy/commit/d40c237102115c1a4e664b8463ef1... Author: Nate Coraor <nate@bx.psu.edu> Date: 2016-05-04 (Wed, 04 May 2016) Changed paths: M lib/galaxy/jobs/runners/drmaa.py M lib/galaxy/jobs/runners/slurm.py Log Message: ----------- If a Slurm post-mortem determines that a job is in a non-terminal state, return the job to the monitor queue. Commit: 338d25403109244f0b228f9a0df23e02e1de7578 https://github.com/galaxyproject/galaxy/commit/338d25403109244f0b228f9a0df23... Author: Nicola Soranzo <nicola.soranzo@tgac.ac.uk> Date: 2016-05-04 (Wed, 04 May 2016) Changed paths: M lib/galaxy/jobs/runners/slurm.py Log Message: ----------- Use partial messages to match SLURM memory warnings Commit: ad0647d677cb1979b9841cf0c56ba26d7ec5ca34 https://github.com/galaxyproject/galaxy/commit/ad0647d677cb1979b9841cf0c56ba... Author: Nicola Soranzo <nicola.soranzo@tgac.ac.uk> Date: 2016-05-04 (Wed, 04 May 2016) Changed paths: M lib/galaxy/jobs/runners/slurm.py Log Message: ----------- Change elif to if because drmaa_state can be changed inside the if Commit: ce8fa33d547855c2f9dee914936db73fe5d47705 https://github.com/galaxyproject/galaxy/commit/ce8fa33d547855c2f9dee914936db... Author: John Chilton <jmchilton@gmail.com> Date: 2016-05-05 (Thu, 05 May 2016) Changed paths: M lib/galaxy/jobs/runners/drmaa.py M lib/galaxy/jobs/runners/slurm.py Log Message: ----------- Merge pull request #2311 from natefoo/drmaa-failed [16.04] If a Slurm post-mortem determines that a job is in a non-terminal state, return the job to the monitor queue Commit: 41e6f22f338a6323cb48a23454ca95e798385045 https://github.com/galaxyproject/galaxy/commit/41e6f22f338a6323cb48a23454ca9... Author: John Chilton <jmchilton@gmail.com> Date: 2016-05-05 (Thu, 05 May 2016) Changed paths: M lib/galaxy/jobs/runners/slurm.py Log Message: ----------- Merge pull request #2309 from nsoranzo/release_16.01_slurm_mem_limit [16.01] Remove SLURM memory limit warning from stderr if the job was successful Commit: ff903ac684d7c59a6bfbde108fe439096505877d https://github.com/galaxyproject/galaxy/commit/ff903ac684d7c59a6bfbde108fe43... Author: Nicola Soranzo <nicola.soranzo@tgac.ac.uk> Date: 2016-05-05 (Thu, 05 May 2016) Changed paths: M lib/galaxy/jobs/runners/slurm.py Log Message: ----------- Merge branch 'release_16.01' into release_16.04 Commit: d7465a47fbea34e69ad8fce46a8a6702cf52d97d https://github.com/galaxyproject/galaxy/commit/d7465a47fbea34e69ad8fce46a8a6... Author: Nicola Soranzo <nicola.soranzo@tgac.ac.uk> Date: 2016-05-05 (Thu, 05 May 2016) Changed paths: M lib/galaxy/jobs/runners/drmaa.py M lib/galaxy/jobs/runners/slurm.py Log Message: ----------- Merge branch 'release_16.04' into dev Compare: https://github.com/galaxyproject/galaxy/compare/432ec84f9206...d7465a47fbea