diff --git a/NEWS b/NEWS
index aa9bab49dbfd7c27f08d75f54e011324d7c0f3e1..27d9ec8f473885dfa916a60763cc211d1618d5e2 100644
--- a/NEWS
+++ b/NEWS
@@ -171,6 +171,8 @@ documents those changes that are of interest to users and admins.
========================
-- sched/backfill - Fix bug that could result in failing to reserve resources
for high priority jobs.
+ -- Correct job RunTime if requeued from suspended state.
+ -- Reset job priority from zero (held) on manual resume from suspend state.
* Changes in Slurm 2.6.5
========================
diff --git a/doc/html/quickstart_admin.shtml b/doc/html/quickstart_admin.shtml
index e9f46203c38f85868667203cc9dca758b7a531b8..825e91523290ac198d6c6c6d0e08291e2a657758 100644
--- a/doc/html/quickstart_admin.shtml
+++ b/doc/html/quickstart_admin.shtml
@@ -654,7 +654,7 @@ if the major and/or minor release number changes.
Slurm daemons will support RPCs and state files from the two previous minor or
releases (e.g. a version 2.6.x SlurmDBD will support slurmctld daemons and
commands with a version of 2.4.x or 2.5.x).
-This means that upgrading at least ones each year is strongly recommended.
+This means that upgrading at least once each year is strongly recommended.
Otherwise, intermediate upgrades will be required to preserve state information.
Changes in the micro release number generally represent only bug fixes,
but may also include very minor enhancements.</p>
diff --git a/doc/html/troubleshoot.shtml b/doc/html/troubleshoot.shtml
index 2f26076a009290f000f7f421c7e75b89fb1093a1..3ab240b8feaff91f11f5bb0e5732f0594abb15a6 100644
--- a/doc/html/troubleshoot.shtml
+++ b/doc/html/troubleshoot.shtml
@@ -205,11 +205,16 @@ compute nodes.
The user doesn't need to be able to login, but his user ID
must exist.</li>
-<li>Check that a consistent version of SLURM exists on all of
+<li>Check that compatible versions of SLURM exists on all of
the nodes (execute "<i>sinfo -V</i>" or "<i>rpm -qa | grep slurm</i>").
-If the first two digits of the version number match it should
-work fine, but version 1.1 commands will not work with
-version 1.2 daemons or vise-versa.</li>
+The Slurm version numbers contain three digits, which represent
+the major, minor and micro release numbers in that order (e.g. 2.5.3 is
+major=2, minor=5, micro=3).
+Changes in the RPCs (remote procedure calls) and state files will only be made
+if the major and/or minor release number changes.
+Slurm daemons will support RPCs and state files from the two previous minor or
+releases (e.g. a version 2.6.x SlurmDBD will support slurmctld daemons and
+commands with a version of 2.4.x or 2.5.x).</li>
</ol>
<p class="footer"><a href="#top">top</a></p>
@@ -296,6 +301,6 @@ partition 000.
</ol>
<p class="footer"><a href="#top">top</a></p>
-<p style="text-align:center;">Last modified 3 February 2012</p>
+<p style="text-align:center;">Last modified 6 January 20124</p>
<!--#include virtual="footer.txt"-->
diff --git a/doc/man/man1/scontrol.1 b/doc/man/man1/scontrol.1
index 3da439328fab1fde801bf6856dd159e192f336b9..420dd6f63f34cacb312dfab76f36afaf6e5b375c 100644
--- a/doc/man/man1/scontrol.1
+++ b/doc/man/man1/scontrol.1
@@ -392,6 +392,7 @@ Use the \fIresume\fP command to resume its execution.
User processes must stop on receipt of SIGSTOP signal and resume
upon receipt of SIGCONT for this operation to be effective.
Not all architectures and configurations support job suspension.
+If a suspended job is requeued, it will be placed in a held state.
.TP
\fBtakeover\fP
diff --git a/src/slurmctld/job_mgr.c b/src/slurmctld/job_mgr.c
index f71538b23627a2df03d96075f21be7365538c103..c3b923e770f16b80441ad7aeef567daa7177cbb8 100644
--- a/src/slurmctld/job_mgr.c
+++ b/src/slurmctld/job_mgr.c
@@ -5,7 +5,7 @@
*****************************************************************************
* Copyright (C) 2002-2007 The Regents of the University of California.
* Copyright (C) 2008-2010 Lawrence Livermore National Security.
- * Portions Copyright (C) 2010-2013 SchedMD <http://www.schedmd.com>.
+ * Portions Copyright (C) 2010-2014 SchedMD <http://www.schedmd.com>.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
@@ -2351,6 +2351,9 @@ extern int kill_job_by_front_end_name(char *node_name)
job_ptr->job_state = JOB_PENDING;
if (job_ptr->node_cnt)
job_ptr->job_state |= JOB_COMPLETING;
+ job_ptr->pre_sus_time = (time_t) 0;
+ job_ptr->suspend_time = (time_t) 0;
+ job_ptr->tot_sus_time = (time_t) 0;
/* restart from periodic checkpoint */
if (job_ptr->ckpt_interval &&
@@ -2585,6 +2588,9 @@ extern int kill_running_job_by_node_name(char *node_name)
job_ptr->job_state = JOB_PENDING;
if (job_ptr->node_cnt)
job_ptr->job_state |= JOB_COMPLETING;
+ job_ptr->pre_sus_time = (time_t) 0;
+ job_ptr->suspend_time = (time_t) 0;
+ job_ptr->tot_sus_time = (time_t) 0;
/* restart from periodic checkpoint */
if (job_ptr->ckpt_interval &&
@@ -10365,6 +10371,8 @@ extern int job_suspend(suspend_msg_t *sus_ptr, uid_t uid,
if (rc != SLURM_SUCCESS)
goto reply;
_suspend_job(job_ptr, sus_ptr->op, indf_susp);
+ if (job_ptr->priority == 0)
+ set_job_prio(job_ptr);
job_ptr->job_state = JOB_RUNNING;
job_ptr->tot_sus_time +=
difftime(now, job_ptr->suspend_time);