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

NEWS

@@ -231,6 +231,8 @@ documents those changes that are of interest to users and administrators.
  -- Change the global eio_shutdown_time to a field in eio handle.
  -- Advanced reservation fixes for heterogeneous systems, especially when
     reserving cores.
+ -- If --hint=nomultithread is used in a job allocation make sure any srun's
+    ran inside the allocation can read the environment correctly.
 
 * Changes in Slurm 14.03.7
 ==========================

src/common/slurm_resource_info.c

@@ -303,6 +303,8 @@ int slurm_verify_cpu_bind(const char *arg, char **cpu_bind,
 		} else if ((strcasecmp(tok, "v") == 0) ||
 			   (strcasecmp(tok, "verbose") == 0)) {
 		        *flags |= CPU_BIND_VERBOSE;
+		} else if ((strcasecmp(tok, "one_thread") == 0)) {
+		        *flags |= CPU_BIND_ONE_THREAD_PER_CORE;
 		} else if ((strcasecmp(tok, "no") == 0) ||
 			   (strcasecmp(tok, "none") == 0)) {
 			_clear_then_set((int *)flags, bind_bits, CPU_BIND_NONE);