Merge branch 'slurm-14.11' into slurm-15.08

b2467c09 · Morris Jette · 9306d69f · 43f5aef3 · b2467c09
Commit b2467c09 authored 9 years ago by Morris Jette
--- a/testsuite/expect/test1.61
+++ b/testsuite/expect/test1.61
@@ -115,7 +115,7 @@ if {[wait_for_file $file_err] == 0} {
 	set timed_out 0
 	spawn cat $file_err
 	expect {
-		-re " STEP $job_id.$step_id CANCELLED AT.*DUE TO TIME LIMIT " {
+		-re " STEP $job_id.$step_id ON .* CANCELLED AT.*DUE TO TIME LIMIT " {
 			set timed_out 1
 			exp_continue
 		}