svn merge -r10415:10425 https://eris.llnl.gov/svn/slurm/branches/slurm-1.1

doc/man/man1/srun.1

@@ -1049,6 +1049,8 @@ The location of the SLURM configuration file.
 .TP
 \fBSLURM_LABELIO\fR
 \fB\-l, \-\-label\fR
+\fBSLURM_UNBUFFEREDIO\fR
+\fB-u, --unbuffered\fR
 .TP
 \fBSLURM_MEM_BIND\fR
 \fB\-\-mem_bind\fR=\fItype\fR

src/srun/opt.c

@@ -1096,6 +1096,7 @@ env_vars_t env_vars[] = {
 	{"SLURM_MPI_TYPE",      OPT_MPI,        NULL,               NULL           },
 	{"SLURM_SRUN_COMM_IFHN",OPT_STRING,     &opt.ctrl_comm_ifhn,NULL           },
 	{"SLURM_SRUN_MULTI",    OPT_MULTI,      NULL,               NULL           },
+	{"SLURM_UNBUFFEREDIO",  OPT_INT,        &opt.unbuffered,    NULL           },
 	{"SLURM_NODELIST",      OPT_STRING,     &opt.alloc_nodelist,NULL           },
 	{NULL, 0, NULL, NULL}
 };