Merge branch 'slurm-2.2'

Conflicts:
	NEWS

NEWS

@@ -155,6 +155,9 @@ documents those changes that are of interest to users and admins.
  -- When restarting slurmctld with priority/basic, increment all job priorities
     so the highest job priority becomes TOP_PRIORITY.
 
+* Changes in SLURM 2.2.6
+========================
+
 * Changes in SLURM 2.2.5
 ========================
  -- Correct init.d/slurm status to have non-zero exit code if ANY Slurm