svn merge -r11142:11151 https://eris.llnl.gov/svn/slurm/branches/slurm-1.1

AUTHORS

@@ -6,6 +6,7 @@ Anton Blanchard <anton@samba.org>
 Hongjia Cao <hgcao@nudt.edu.cn>
 Chuck Clouston <Chuck.Clouston.bull.com>
 Daniel Christians <Daniel.Christians@hp.com>
+Gilles Civario <gilles.civario@bull.net>
 Chris Dunlap <cdunlap@llnl.gov>
 Joey Ekstrom <ekstrom1@llnl.gov>
 Jim Garlick <garlick@llnl.gov>

NEWS

@@ -245,6 +245,8 @@ documents those changes that are of interest to users and admins.
 =========================
  - sched/wiki - Do not wait for job completion before permitting 
    additional jobs to be scheduled.
+ - Add srun SLURM_EXCLUSIVE environment variable support, from 
+   Gilles Civario (Bull)
 
 * Changes in SLURM 1.1.32
 =========================

doc/html/team.shtml

@@ -25,6 +25,7 @@
 <li>Anton Blanchard (Samba)</li>
 <li>Hongjia Cao (National University of Defense Techonogy, China)</li>
 <li>Daniel Christians (HP)</li>
+<li>Gilles Civario (Bull)</li>
 <li>Chuck Clouston (Bull)</li>
 <li>Chris Dunlap (LLNL)</li>
 <li>Joey Ekstrom (LLNL/Bringham Young University)</li>
@@ -49,6 +50,6 @@ Networking, Italy)</li>
 <li>Anne-Marie Wunderlin (Bull)</li>
 </ul>
 
-<p style="text-align:center;">Last modified 11 December 2006</p>
+<p style="text-align:center;">Last modified 14 March 2007</p>
 
 <!--#include virtual="footer.txt"-->

doc/man/man1/srun.1

@@ -1219,7 +1219,10 @@ Same as \fB\-\-no\-rotate\fR
 Same as \fB\-n, \-\-ntasks\fR=\fIn\fR
 .TP
 \fBSLURM_OVERCOMMIT\fR
-Same as \fB\-o, \-\-overcommit\fR
+Same as \fB\-O, \-\-overcommit\fR
+.TP
+\fBSLURM_EXCLUSIVE\fR
+Same as \fB\-\-exclusive\fR
 .TP
 \fBSLURM_PARTITION\fR
 Same as \fB\-p, \-\-partition\fR=\fIpartition\fR

src/srun/opt.c

@@ -104,6 +104,7 @@
 #define OPT_NSOCKETS    0x10
 #define OPT_NCORES      0x11
 #define OPT_NTHREADS    0x12
+#define OPT_EXCLUSIVE   0x13
 
 /* generic getopt_long flags, integers and *not* valid characters */
 #define LONG_OPT_HELP        0x100
@@ -1111,6 +1112,7 @@ env_vars_t env_vars[] = {
 {"SLURM_TASK_PROLOG",   OPT_STRING,     &opt.task_prolog,   NULL             },
 {"SLURM_TASK_EPILOG",   OPT_STRING,     &opt.task_epilog,   NULL             },
 {"SLURM_WORKING_DIR",   OPT_STRING,     &opt.cwd,           &opt.cwd_set     },
+{"SLURM_EXCLUSIVE",     OPT_EXCLUSIVE,  NULL,               NULL             },
 {NULL, 0, NULL, NULL}
 };
 
@@ -1194,6 +1196,10 @@ _process_env_var(env_vars_t *e, const char *val)
 		opt.overcommit = true;
 		break;
 
+	case OPT_EXCLUSIVE:
+		opt.exclusive = true;
+		break;
+
 	case OPT_CORE:
 		opt.core_type = core_format_type (val);
 		break;