Merge branch 'slurm-2.6'

doc/html/quickstart_admin.shtml

@@ -690,6 +690,11 @@ versions (e.g. 2.5.0-pre1 to 2.5.0-pre2).
 We'll try to note these cases in the NEWS file.
 Contents of major releases are also described in the RELEASE_NOTES file.</p>
 
+<p>If you have built your own version of Slurm plugins, they will likely
+need modification to support a new version of Slurm. It is common for plugins
+to add new functions and function arguments during major updates.
+See the RELEASE_NOTES file for details.</p>
+
 <a name="FreeBSD"><h2>FreeBSD</h2></a>
 
 <p>FreeBSD administrators can install the latest stable slurm as a binary
@@ -709,6 +714,6 @@ options such as mysql, postgresql, and gui tools via a configuration menu.</p>
 
 </pre> <p class="footer"><a href="#top">top</a></p>
 
-<p style="text-align:center;">Last modified 4 December 2013</p>
+<p style="text-align:center;">Last modified 10 December 2013</p>
 
 <!--#include virtual="footer.txt"-->

doc/man/man5/gres.conf.5

@@ -58,6 +58,11 @@ use of resources allocated to a different user).
 If \fBFile\fR is specified then \fBCount\fR must be either set to the number
 of file names specified or not set (the default value is the number of files
 specified).
+Slurm must track the utilization of each individual device If device file
+names are specified, which involves more overhead than just tracking the
+device counts.
+Use the \fBFile\fR parameter only if the \fBCount\fR is not sufficient for
+tracking purposes.
 NOTE: If you specify the \fBFile\fR parameter for a resource on some node,
 the option must be specified on all nodes and SLURM will track the assignment
 of each specific resource on each node. Otherwise SLURM will only track a

doc/man/man5/slurm.conf.5

@@ -2154,6 +2154,9 @@ The default value is "root".
 \fBSlurmctldDebug\fR
 The level of detail to provide \fBslurmctld\fR daemon's logs.
 The default value is \fBinfo\fR.
+If the \fBslurmctld\fR daemon is initiated with \-v or \-\-verbose options,
+that debug level will be preserve or restored upon reconfiguration.
+
 .RS
 .TP 10
 \fBquiet\fR