Merge branch 'slurm-2.3'

NEWS

@@ -192,6 +192,8 @@ documents those changes that are of interest to users and admins.
     Bill Brophy, Bull.
  -- Modify Makefiles for support of Debian hardening flags. Patch from
     Simon Ruderich.
+ -- CRAY: Fix support for configuration with SlurmdTimeout=0 (never mark
+    node that is DOWN in ALPS as DOWN in SLURM).
 
 * Changes in SLURM 2.3.4
 ========================

src/plugins/select/cray/basil_interface.c

@@ -253,7 +253,7 @@ extern int basil_inventory(void)
 				node_ptr->down_time = now;
 			if (IS_NODE_DOWN(node_ptr)) {
 				/* node still down */
-			} else if (slurmctld_conf.slurmd_timeout &&
+			} else if ((slurmctld_conf.slurmd_timeout == 0) ||
 				   ((now - node_ptr->down_time) <
 				    slurmctld_conf.slurmd_timeout)) {
 				node_ptr->node_state |= NODE_STATE_NO_RESPOND;