Branch b1_8_gate

b=16929
o=adilger
i=johann
i=tom.wang (wangdi)

Disable file join on production releases.

diff --git a/lustre/tests/sanityN.sh b/lustre/tests/sanityN.sh
index d4533a4..744d172 100644 (file)
--- a/lustre/tests/sanityN.sh
+++ b/lustre/tests/sanityN.sh
@@ -3,8 +3,8 @@
 set -e
 
 ONLY=${ONLY:-"$*"}
-# bug number for skipped test:  3192 12652  15528/3811 9977  15528/11549
-ALWAYS_EXCEPT="                 14b  14c    19         28    29           $SANITYN_EXCEPT"
+# bug number for skipped test: 3192 12652  15528/3811 16929 9977 15528/11549
+ALWAYS_EXCEPT="                14b  14c    19         22    28   29          $SANITYN_EXCEPT"
 # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
 
 # bug number for skipped test:                                                    12652 12652