svn merge -r9818:9824 https://eris.llnl.gov/svn/slurm/branches/slurm-1.1

NEWS

@@ -15,7 +15,8 @@ documents those changes that are of interest to users and admins.
  -- Multi-core support in sinfo, squeue, and scontrol.
  -- Memory can be treated as a consumable resource.
  -- New srun options --ntasks-per-[node|socket|core].
- -- patch from HP patch.1.2.0.pre4.061017.crcore_hints
+ -- Patch from HP patch.1.2.0.pre4.061017.crcore_hints, supports cores as consumable
+    resource.
 
 * Changes in SLURM 1.2.0-pre3
 =============================

doc/man/man1/srun.1

@@ -1080,7 +1080,13 @@ are:
 
 .TP
 \fBSLURM_CPUS_ON_NODE\fR
-Count of processors available to the job on this node
+Count of processors available to the job on this node.
+Note the select/linear plugin allocates entire nodes to 
+jobs, so the value indicates the total count of CPUs on the node.
+The select/cons_res plugin allocates individual processors 
+to jobs, so this number indicates the number of processors 
+on this node allocated to the job.
+
 .TP
 \fBSLURM_JOBID\fR
 Job id of the executing job

src/plugins/select/bluegene/plugin/bluegene.c

@@ -287,7 +287,6 @@ extern void process_nodes(bg_record_t *bg_record)
 		if(!bg_record->bg_block_list) {
 			bg_record->bg_block_list =
 				list_create(destroy_ba_node);
-			info("got here");
 		}
 		bg_record->bp_count = 0;
 		
@@ -445,7 +444,6 @@ extern void copy_bg_record(bg_record_t *fir_record, bg_record_t *sec_record)
 	if(fir_record->bg_block_list) {
 		itr = list_iterator_create(fir_record->bg_block_list);
 		while((ba_node = list_next(itr))) {
-			info("got here 2");
 			new_ba_node = ba_copy_node(ba_node);
 			list_push(sec_record->bg_block_list, new_ba_node);
 		}