svn merge -r16629:16646 https://eris.llnl.gov/svn/slurm/branches/slurm-1.3

860bebaa · Danny Auble · 7125f7b8 · 860bebaa
Commit 860bebaa authored 16 years ago by Danny Auble
--- a/NEWS
+++ b/NEWS
@@ -33,7 +33,7 @@ documents those changes that are of interest to users and admins.
    data structures. Add environment variable SLURM_STEP_RESV_PORTS to
    show what ports are reserved for a job step.
 -- NOTE: Cold-start (without preserving state) required for upgrade from 
-    version 1.4.0-pre7.
+    version 1.4.0-pre7. 

 * Changes in SLURM 1.4.0-pre7
 =============================