Skip to content
Snippets Groups Projects
Commit 3d2b31db authored by Brian Christiansen's avatar Brian Christiansen
Browse files

Merge remote-tracking branch 'origin/slurm-15.08'

parents a81b0454 5ff61e49
No related branches found
No related tags found
No related merge requests found
...@@ -146,6 +146,8 @@ documents those changes that are of interest to users and administrators. ...@@ -146,6 +146,8 @@ documents those changes that are of interest to users and administrators.
reservation sequeuece numbering scheme. reservation sequeuece numbering scheme.
-- Fix scontrol to be able to accept TRES as an option when creating -- Fix scontrol to be able to accept TRES as an option when creating
a reservation. a reservation.
-- contrib/torque/qstat.pl - return exit code of zero even with no records
printed for 'qstat -u'.
* Changes in Slurm 15.08.6 * Changes in Slurm 15.08.6
========================== ==========================
......
...@@ -227,8 +227,8 @@ if(defined($queueList)) { ...@@ -227,8 +227,8 @@ if(defined($queueList)) {
print_job_brief($job, $line); print_job_brief($job, $line);
$line++; $line++;
} }
$rc = 0;
} }
$rc = 0;
} }
# Exit with status code # Exit with status code
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment