diff --git a/NEWS b/NEWS index 5e2515fd2ec1a3c71c747e5cc2589a68499931dc..3c5ba71d4f7452b8cc23e0fb51aeb6956ae0ded2 100644 --- a/NEWS +++ b/NEWS @@ -9,7 +9,6 @@ documents those changes that are of interest to users and admins. -- Reset job priority from zero (held) on manual resume from suspend state. -- If FastSchedule=0 then do not DOWN a node with low memory or disk size. -- Remove vestigial note. - -- Update the sshare.1 man page making it consistent with sacctmgr.1. * Changes in Slurm 2.6.5 ======================== @@ -56,7 +55,7 @@ documents those changes that are of interest to users and admins. on a random memory location (i.e. whatever is on the stack), which can result in slurmstepd dying and a completed job not being purged in a timely fashion. - -- Fix slurmstepd race condition when separate threads are reading and + -- Fix slurmstepd race condition when separate threads are reading and modifying the job's environment, which can result in the slurmstepd failing with an invalid memory reference. -- Fix erroneous error messages when running gang scheduling. @@ -128,7 +127,7 @@ documents those changes that are of interest to users and admins. -- Fix sacctmgr modify qos set preempt+/-=. -- BLUEGENE - fix issue where node count wasn't set up correctly when srun preforms the allocation, regression in 2.6.3. - -- Add support for dependencies of job array elements (e.g. + -- Add support for dependencies of job array elements (e.g. "sbatch --depend=afterok:123_4 ...") or all elements of a job array (e.g. "sbatch --depend=afterok:123 ..."). -- Add support for new options in sbatch qsub wrapper: diff --git a/doc/man/man1/sshare.1 b/doc/man/man1/sshare.1 index 5cb0c1449b1d76ee6555fb2b8d9e98db96e6de46..f191426f2ddb3438cd678f20fabca5d38e5bb6c7 100644 --- a/doc/man/man1/sshare.1 +++ b/doc/man/man1/sshare.1 @@ -109,17 +109,11 @@ the effective usage charged to them or their accounts. .TP \f3GrpCPUMins\fP The CPU-minutes limit set on the account. -The total number of cpu minutes that can possibly be used by past, -present and future jobs running from this account and its children. .TP \f3CPURunMins\fP -The number of CPU-minutes allocated to jobs currently running against -the account. Used to limit the combined total number of CPU minutes -used by all jobs running with this account and its children. -This takes into consideration time limit of running jobs and consumes it, -if the limit is reached no new jobs are started until other jobs finish -to allow time to free up. +The number of CPU-minutes accumulated by jobs currently running against +the account. .SH "EXAMPLES" .eo