Merge branch 'slurm-2.5'

NEWS

@@ -57,6 +57,7 @@ documents those changes that are of interest to users and admins.
  -- Fix topology/tree logic when nodes defined in slurm.conf get re-ordered.
  -- In select/cons_res, correct logic to allocate whole sockets to jobs. Work
     by Magnus Jonsson, Umea University.
+ -- In select/cons_res, correct logic when job removed from only some nodes.
 
 * Changes in SLURM 2.5.1
 ========================

src/plugins/select/cons_res/select_cons_res.c

@@ -580,14 +580,8 @@ static void _build_row_bitmaps(struct part_res_record *p_ptr,
 				size = bit_size(this_row->row_bitmap);
 				bit_nclear(this_row->row_bitmap, 0, size-1);
 			}
-		} else {
-			xassert(job_ptr);
-			xassert(job_ptr->job_resrcs);
-			remove_job_from_cores(job_ptr->job_resrcs,
-					      &this_row->row_bitmap,
-					      cr_node_num_cores);
+			return;
 		}
-		return;
 	}
 
 	/* gather data */