Merge branch 'slurm-2.3'

NEWS

@@ -87,6 +87,7 @@ documents those changes that are of interest to users and admins.
  -- Backfill scheduling - Add SchedulerParameters configuration parameter of
     "bf_res" to control the resolution in the backfill scheduler's data about
     when jobs begin and end. Default value is 60 seconds (used to be 1 second).
+ -- Cray - Remove the "family" specification from the GPU reservation request.
 
 * Changes in SLURM 2.3.1
 ========================

src/plugins/select/cray/libalps/basil_request.c

@@ -84,9 +84,6 @@ static void _rsvn_write_reserve_xml(FILE *fp, struct basil_reservation *r)
 				fprintf(fp, "    <AccelParam type=\"%s\"",
 					nam_acceltype[accel->type]);
 
-				if (accel->family && *accel->family)
-					fprintf(fp, " family=\"%s\"",
-						accel->family);
 				if (accel->memory_mb)
 					fprintf(fp, " memory_mb=\"%u\"",
 						accel->memory_mb);