Branch HEAD

b=19280,17974

Temporarily disable test 50e and 50f, which are broken in multi-node configurations.

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index e6e48be..db65e25 100644 (file)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -11,8 +11,8 @@ set -e
 
 ONLY=${ONLY:-"$*"}
 
-# bug number for skipped test: 13739
-HEAD_EXCEPT="                  32a"
+# bug number for skipped test: 13739 19280
+HEAD_EXCEPT="                  32a    50e 50f"
 
 # bug number for skipped test:                                 
 ALWAYS_EXCEPT=" $CONF_SANITY_EXCEPT $HEAD_EXCEPT"