svn merge -r7311:7406 https://eris.llnl.gov/svn/slurm/branches/slurm-1.0

src/plugins/proctrack/rms/proctrack_rms.c

@@ -137,10 +137,10 @@ extern int slurm_container_signal  (uint32_t id, int signal)
 
         rc = -1;
         for (i = nids-2; i >= 0 ; i--) {
-		debug3("proctrack/rms(pid %d) Sending signal %d to process %d",
+		debug2("proctrack/rms(pid %d) Sending signal %d to process %d",
 		       getpid(), signal, pids[i]);
 		rc &= kill(pids[i], signal);
-		debug("rc = %d", rc);
+		debug2("  rc = %d", rc);
 	}
         free(pids);
 	debug3("proctrack/rms signal container returning %d", rc);

src/plugins/switch/elan/qsw.c

@@ -925,6 +925,7 @@ qsw_prog_fini(qsw_jobinfo_t jobinfo)
 	if (shmid >= 0) {
 		debug2("qsw_prog_fini");
 		shmctl (shmid, IPC_RMID, NULL);
+		debug2("qsw_prog_fini shmctl IPC_RMID complete");
 	}
 	/* Do nothing... apparently this will be handled by
 	 *  callbacks in the kernel exit handlers ...