Merge remote-tracking branch 'origin/slurm-14.03' into slurm-14.11

NEWS

@@ -365,6 +365,8 @@ documents those changes that are of interest to users and administrators.
  -- sview - Fix displaying of suspended steps elapsed times.
  -- Increase number of messages that get cached before throwing them away
     when the DBD is down.
+ -- Fix jobs from starting in overlapping reservations that won't finish before
+    a "maint" reservation begins.
 
 * Changes in Slurm 14.03.10
 ===========================

src/slurmctld/reservation.c

@@ -4087,7 +4087,8 @@ extern int job_test_resv(struct job_record *job_ptr, time_t *when,
 		iter = list_iterator_create(resv_list);
 		while ((res2_ptr = (slurmctld_resv_t *) list_next(iter))) {
 			if ((resv_ptr->flags & RESERVE_FLAG_MAINT) ||
-			    (resv_ptr->flags & RESERVE_FLAG_OVERLAP) ||
+			    ((resv_ptr->flags & RESERVE_FLAG_OVERLAP) &&
+			     !(res2_ptr->flags & RESERVE_FLAG_MAINT)) ||
 			    (res2_ptr == resv_ptr) ||
 			    (res2_ptr->node_bitmap == NULL) ||
 			    (res2_ptr->start_time >= job_end_time) ||