svn merge -r14115:14120 https://eris.llnl.gov/svn/slurm/branches/slurm-1.2

NEWS

@@ -294,6 +294,9 @@ documents those changes that are of interest to users and admins.
     Moved existing digital signature logic into new plugin: crypto/openssl.
     Added new support for crypto/munge (available with GPL license).
 
+* Changes in SLURM 1.2.31
+=========================
+
 * Changes in SLURM 1.2.30
 =========================
  -- Fix for gold not to print out 720 error messages since they are

testsuite/expect/test15.21

@@ -107,11 +107,7 @@ expect {
 			cancel_job $job_id
 		}
 		slow_kill [expr 0 - $salloc_pid]
-		if {$waiting == 1} {
-			send_user "\nWARNING: salloc still not responding, quiting\n"
-		} else {
-			send_user "\nFAILURE: salloc not responding\n"
-		}
+		send_user "\nFAILURE: salloc not responding\n"
 		exit 1
 	}
 	eof {