svn merge -r13607:13623 https://eris.llnl.gov/svn/slurm/branches/slurm-1.2

NEWS

@@ -209,7 +209,10 @@ documents those changes that are of interest to users and admins.
  -- Add salloc options --chdir and --get-user-env (for Moab).
  -- Modify scontrol update to support job comment changes.
  -- Do not clear a DRAINED node's reason field when slurmctld restarts.
- -- Do not kill a pending job if Moab or Maui try to start it on unusable nodes.
+ -- Do not cancel a pending job if Moab or Maui try to start it on unusable nodes.
+    Leave the job queued.
+ -- Add --requeue option to srun and sbatch (these undocumented options have no
+    effect in slurm v1.2, but are legitimate options in slurm v1.3).
  
 * Changes in SLURM 1.2.24
 =========================