svn merge -r22021:22027 https://eris.llnl.gov/svn/slurm/branches/slurm-2.2

NEWS

@@ -22,6 +22,8 @@ documents those changes that are of interest to users and admins.
     specific reservation.
  -- Treat reservation with no nodes like one that starts later (let jobs of any
     size get queued).
+ -- Fix bug in gang scheduling logic that would temporarily resume to many jobs
+    after a job completed.
 
 * Changes in SLURM 2.2.0
 ========================

src/slurmctld/gang.c

@@ -687,7 +687,7 @@ static int _sort_partitions(void *part1, void *part2)
 {
 	int prio1 = ((struct gs_part *) part1)->priority;
 	int prio2 = ((struct gs_part *) part2)->priority;
-	return prio1 - prio2;
+	return prio2 - prio1;
 }
 
 /* Scan the partition list. Add the given job as a "shadow" to every

src/slurmctld/power_save.c

@@ -46,6 +46,10 @@
 #  include "config.h"
 #endif
 
+#ifndef   _GNU_SOURCE
+#  define _GNU_SOURCE
+#endif
+
 #include <signal.h>
 #include <stdlib.h>
 #include <string.h>