Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: cb01f3dd332c4ff1b6a5e1ffff53a3758b8ac15e https://github.com/galaxyproject/galaxy/commit/cb01f3dd332c4ff1b6a5e1ffff53a... Author: Nate Coraor <nate@bx.psu.edu> Date: 2017-11-08 (Wed, 08 Nov 2017) Changed paths: M lib/galaxy/jobs/runners/util/job_script/DEFAULT_JOB_FILE_TEMPLATE.sh A lib/galaxy/jobs/runners/util/job_script/MEMORY_STATEMENT.sh M lib/galaxy/jobs/runners/util/job_script/__init__.py M lib/galaxy/tools/xsd/galaxy.xsd Log Message: ----------- Create the $GALAXY_MEMORY_MB tool job environment variable and attempt to set it automatically under Slurm. Commit: 49c0c406e5f386307c20b190844a25fd41974a73 https://github.com/galaxyproject/galaxy/commit/49c0c406e5f386307c20b190844a2... Author: Nate Coraor <nate@bx.psu.edu> Date: 2017-11-10 (Fri, 10 Nov 2017) Changed paths: M lib/galaxy/jobs/runners/util/job_script/MEMORY_STATEMENT.sh Log Message: ----------- When setting $GALAXY_MEMORY_MB, redirect stderr to memory_statement.log in the job directory. Also, use -1 as the default for the final test to see if $GALAXY_MEMORY_MB is a positive integer. This allows an admin to differentiate between a legit case where we don't set $GALAXY_MEMORY_MB (currently any DRM other than Slurm) and where the command ran but returned nothing on stdout. Commit: a18835b5169cbc281daa7de9dbfd655ab96f17f4 https://github.com/galaxyproject/galaxy/commit/a18835b5169cbc281daa7de9dbfd6... Author: John Chilton <jmchilton@gmail.com> Date: 2017-11-13 (Mon, 13 Nov 2017) Changed paths: M lib/galaxy/jobs/runners/util/job_script/DEFAULT_JOB_FILE_TEMPLATE.sh A lib/galaxy/jobs/runners/util/job_script/MEMORY_STATEMENT.sh M lib/galaxy/jobs/runners/util/job_script/__init__.py M lib/galaxy/tools/xsd/galaxy.xsd Log Message: ----------- Merge pull request #4958 from natefoo/memory-env-var Create the $GALAXY_MEMORY_MB tool job environment variable Compare: https://github.com/galaxyproject/galaxy/compare/0799e511c41d...a18835b5169c