Merge branch 'slurm-14.03' into slurm-14.11

Conflicts: src/sbatch/opt.c

Merge branch 'slurm-14.03' into slurm-14.11
Conflicts: src/sbatch/opt.c
d6a5b6db · jette · 7213891c · e85d88a9 · d6a5b6db
Commit d6a5b6db authored 10 years ago by jette
--- a/NEWS
+++ b/NEWS
@@ -544,6 +544,7 @@ documents those changes that are of interest to users and administrators.
    differ.
 -- Use the slurm_getpwuid_r wrapper of getpwuid_r to handle possible
    interrupts.
+ -- Allow --ignore-pbs to take effect when read as an #SBATCH argument.

 * Changes in Slurm 14.03.11
 ===========================