svn merge -r10450:10463 https://eris.llnl.gov/svn/slurm/branches/slurm-1.1

doc/man/man5/slurm.conf.5

@@ -999,7 +999,7 @@ Possible values are "FORCE", "YES", and "NO".
 without user means of disabling it.
 "YES" makes nodes in the partition available for sharing if and 
 only if the individual jobs permit sharing (see the srun 
-"\-\-shared" option).
+"\-\-share" option).
 "NO" makes nodes unavailable for sharing under all circumstances. 
 The default value is "NO".
 .TP

src/plugins/sched/backfill/backfill.c

@@ -324,12 +324,14 @@ _attempt_backfill(struct part_record *part_ptr)
 		goto cleanup;
 
 	i = list_count(run_job_list) + cg_hung;
-	if ( (i == 0) || (i > MAX_JOB_CNT) )
-		goto cleanup;		/* no running jobs or already have many */
-	if (list_is_empty(pend_job_list))
-		goto cleanup;		/* no pending jobs */
-	if (min_pend_job_size > part_specs.idle_node_cnt)
-		goto cleanup;		/* not enough free nodes for any pending job */
+	/* Do not try to backfill if
+	 * we already have many running jobs,
+	 * there are no pending jobs, OR
+	 * there are insufficient idle nodes to start any pending jobs */
+	if ((i > MAX_JOB_CNT)
+	|| list_is_empty(pend_job_list)
+	|| (min_pend_job_size > part_specs.idle_node_cnt))
+		goto cleanup;
 
 	list_sort(pend_job_list, _sort_by_prio);
 	list_sort(run_job_list, _sort_by_end);