Merge branch 'slurm-15.08' into slurm-16.05

b16e03f0 · Tim Wickberg · 8b430b6a · dca5cb3f · b16e03f0
Commit b16e03f0 authored 8 years ago by Tim Wickberg
--- a/testsuite/expect/test7.11
+++ b/testsuite/expect/test7.11
@@ -120,10 +120,6 @@ expect {
 	}
 }

-# Allow enough time for configuration file in NFS to be propagated
-# to all nodes of cluster
-exec sleep 60
-
 #
 # Test of srun help message
 #