Merge branch 'slurm-14.03'

NEWS

@@ -187,6 +187,9 @@ documents those changes that are of interest to users and admins.
  -- Perl package: Define some missing node states.
  -- When using AccountingStorageType=accounting_storage/mysql zero out the
     database index for the array elements avoiding duplicate database values.
+ -- Reword the explanation of cputime and cputimeraw in the sacct man page.
+ -- JobCompType allows "jobcomp/mysql" as valid name but the code used
+    "job_comp/mysql" setting an incorrect default database.
 
 * Changes in Slurm 14.03.6
 ==========================

doc/html/mail.shtml

@@ -3,9 +3,12 @@
 <h1>Mailing Lists</h1>
 <p>We maintain two Slurm mailing lists:</p>
 <ul>
-<li><b>slurm-announce@schedmd.com</b> is designated for communications about SLURM releases
-[low traffic].</li>
-<li><b>slurm-dev@schedmd.com</b> is designated for communications to SLURM developers
+<li><b>slurm-announce@schedmd.com</b> is designated for communications about
+Slurm releases. The ability to post to this list is restricted to a few Slurm
+developers [low traffic].</li>
+<li><b>slurm-dev@schedmd.com</b> is designated for communications to Slurm
+developers and is typically used by Slurm users or system administrators.
+Any person subscribed to this mailing list may post to it.
 [high traffic at times].</li>
 </ul>
 <p>To subscribe to either list, vist the link below, sign up and get involved!<p>
@@ -18,6 +21,6 @@ You can likewise unsubscribe from either list at the same link.
 and<br>
 <a href="http://groups.google.com/group/slurm-devel">http://groups.google.com/group/slurm-devel</a></p>
 
-<p style="text-align:center;">Last modified 3 April 2013</p>
+<p style="text-align:center;">Last modified 5 August 2014</p>
 
 <!--#include virtual="footer.txt"-->

doc/man/man1/sacct.1

@@ -476,13 +476,13 @@ Note: Only in case of exclusive job allocation this value
 reflects the jobs' real energy consumption.
 
 .TP
-\f3cputime\fP
-Formatted number of cpu seconds a process was allocated.
+\f3CPUTime\fP
+Formatted (Elapsed time * CPU) count used by a job or step.
 
 .TP
-\f3cputimeraw\fP
-How much cpu time process was allocated in second format, not formatted
-like above.
+\f3CPUTimeRaw\fP
+Unlike above non formatted (Elapsed time * CPU) count for a job or step.
+Units are cpu-seconds.
 
 .TP
 \f3DerivedExitCode\fP

src/common/read_config.c

@@ -3127,7 +3127,7 @@ _validate_and_set_defaults(slurm_ctl_conf_t *conf, s_p_hashtbl_t *hashtbl)
 	if (!s_p_get_string(&conf->job_comp_loc, "JobCompLoc", hashtbl)) {
 		if (default_storage_loc)
 			conf->job_comp_loc = xstrdup(default_storage_loc);
-		else if (!strcmp(conf->job_comp_type, "job_comp/mysql"))
+		else if (!strcmp(conf->job_comp_type, "jobcomp/mysql"))
 			conf->job_comp_loc = xstrdup(DEFAULT_JOB_COMP_DB);
 		else
 			conf->job_comp_loc = xstrdup(DEFAULT_JOB_COMP_LOC);