Merge branch 'slurm-17.02' of https://github.com/SchedMD/slurm into slurm-17.02

Conflicts:
	NEWS

NEWS

@@ -11,6 +11,7 @@ documents those changes that are of interest to users and administrators.
     requeue the job but leave it in a cancelled state.
  -- capmc_resume (Cray resume node script) - Do not disable changing a node's
     active features if SyscfgPath is configured in the knl.conf file.
+ -- Improve the srun documentation for the --resv-ports option.
  -- burst_buffer/cray - Fix parsing for discontinuous allocated nodes. A job
     allocation of "20,22" must be expressed as "20\n22".
 

doc/man/man1/srun.1

@@ -1782,12 +1782,13 @@ This is only supported with some system configurations and will otherwise be
 silently ignored. This option applies to job allocations.
 
 .TP
-\fB\-\-resv\-ports\fR
+\fB\-\-resv\-ports\fR[=\fIcount\fR]
 Reserve communication ports for this job. Users can specify the number
 of port they want to reserve. The parameter MpiParams=ports=12000-12999
-must be specified in \fIslurm.conf\fR. If not specified the default reserve
-number of ports equal to the number of tasks. If the number of reserved ports
-is zero no ports is reserved.
+must be specified in \fIslurm.conf\fR. If not specified and Slurm's OpenMPI
+plugin is used, then by default the number of reserved equal to the highest
+number of tasks on any node in the job step allocation.
+If the number of reserved ports is zero then no ports is reserved.
 Used for OpenMPI. This option applies to job and step allocations.
 
 .TP

doc/man/man1/sview.1

@@ -55,6 +55,9 @@ not visible by scrolling down the window.
 The gtk2\-engines\-qtcurve theme does seem to have particularly good
 scalability.
 
+Newer gtk3 themes do not allow the background colors used for the node map
+to be displayed.
+
 On systems with the topology/tree plugin configured, the sview command will
 attempt to display the nodes on each switch on a separate line.
 Change the sview configuration for optimal viewing by selecting "Options" then