Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: d24bc3df1e627a0586860600a89352f6bddf49b1 https://github.com/galaxyproject/galaxy/commit/d24bc3df1e627a0586860600a8935... Author: Lance Parsons <lparsons@genomics.princeton.edu> Date: 2015-12-16 (Wed, 16 Dec 2015) Changed paths: M lib/galaxy/jobs/runners/util/job_script/CLUSTER_SLOTS_STATEMENT.sh Log Message: ----------- Use both SLURM_NTASKS and SLURM_CPUS_PER_TASK to set GALAXY_SLOTS Commit: 1c21ba82417f2a6d3e8d024ccd3a60a3416f5340 https://github.com/galaxyproject/galaxy/commit/1c21ba82417f2a6d3e8d024ccd3a6... Author: Nate Coraor <nate@bx.psu.edu> Date: 2016-01-04 (Mon, 04 Jan 2016) Changed paths: M lib/galaxy/jobs/runners/util/job_script/CLUSTER_SLOTS_STATEMENT.sh Log Message: ----------- Prefer $SLURM_CPUS_ON_NODE for $GALAXY_SLOTS to other SLURM variables. Commit: 9bbe4b869e000e0b86e85e19743390c0bed77d57 https://github.com/galaxyproject/galaxy/commit/9bbe4b869e000e0b86e85e1974339... Author: Lance Parsons <lparsons@yahoo.com> Date: 2016-01-04 (Mon, 04 Jan 2016) Changed paths: M lib/galaxy/jobs/runners/util/job_script/CLUSTER_SLOTS_STATEMENT.sh Log Message: ----------- Merge pull request #1 from natefoo/lparsons_galaxy_slots Prefer $SLURM_CPUS_ON_NODE for $GALAXY_SLOTS to other SLURM variables. Commit: 4c0bb9902ada3ed2dea7f1eeeb047aa4f9228be0 https://github.com/galaxyproject/galaxy/commit/4c0bb9902ada3ed2dea7f1eeeb047... Author: Nate Coraor <nate@bx.psu.edu> Date: 2016-01-04 (Mon, 04 Jan 2016) Changed paths: M lib/galaxy/jobs/runners/util/job_script/CLUSTER_SLOTS_STATEMENT.sh Log Message: ----------- Merge pull request #1347 from lparsons/galaxy_slots Use both SLURM_NTASKS and SLURM_CPUS_PER_TASK to set GALAXY_SLOTS Compare: https://github.com/galaxyproject/galaxy/compare/28cf2822f7bb...4c0bb9902ada