Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 3c97d30cd6b4f11270fc1e057f236f420542cfea https://github.com/galaxyproject/galaxy/commit/3c97d30cd6b4f11270fc1e057f236... Author: Marius van den Beek m.vandenbeek@gmail.com Date: 2016-04-13 (Wed, 13 Apr 2016)

Changed paths: M lib/galaxy/jobs/runners/util/job_script/CLUSTER_SLOTS_STATEMENT.sh

Log Message: ----------- Use "$NCPUS" if defined to set GALAXY_SLOTS

On our PBS cluster we do not have $PBS_NCPUS, and $PBS_NODEFILE contains the hostname of the nodes the task runs on. But we do have "$NCPUS" with the correct number of CPUS.

Commit: 148d4ee88d2982dd5784ec6f1199fa795beaef5d https://github.com/galaxyproject/galaxy/commit/148d4ee88d2982dd5784ec6f1199f... Author: Nicola Soranzo nsoranzo@tiscali.it Date: 2016-04-14 (Thu, 14 Apr 2016)

Changed paths: M lib/galaxy/jobs/runners/util/job_script/CLUSTER_SLOTS_STATEMENT.sh

Log Message: ----------- Merge pull request #2145 from mvdbeek/pbs_ncpu

Use "$NCPUS" if defined to set GALAXY_SLOTS

Compare: https://github.com/galaxyproject/galaxy/compare/87e2a6cd5753...148d4ee88d29