svn merge -r13156:13179 https://eris.llnl.gov/svn/slurm/branches/slurm-1.2

NEWS

@@ -153,6 +153,8 @@ documents those changes that are of interest to users and admins.
     Note this will be overwritten in the output file unless JobFileAppend
     is set in slurm.conf. In slurm version 1.3, srun's --open-mode=append
     option will offer this control for each job.
+ -- Change a node's default TmpDisk from 1MB to 0MB and change job's default 
+    disk space requirement from 1MB to 0MB.
 
 * Changes in SLURM 1.2.22
 =========================

doc/man/man5/slurm.conf.5

@@ -1186,7 +1186,7 @@ system is purged as needed so that user jobs have access to
 most of this space. 
 The Prolog and/or Epilog programs (specified in the configuration file) 
 might be used to insure the file system is kept clean. 
-The default value is 1.
+The default value is 0.
 
 .TP
 \fBWeight\fR