b=19293

fix sanity-quota.sh conflict

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 19e7553..a4272eb 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -59,6 +59,11 @@ tbd Sun Microsystems, Inc.
          more information, please refer to bugzilla 17630.
 
 Severity   : enhancement
+Bugzilla   : 19293
+Description: move AT tunable parameters for more consistent usage
+Details    : add AT tunables under /proc/sys/lustre, add to conf_param parsing
+
+Severity   : enhancement
 Bugzilla   : 19024
 Description: Update kernel to RHEL5.3 2.6.18-128.1.6.el5.
 

diff --git a/lustre/tests/sanity-quota.sh b/lustre/tests/sanity-quota.sh
index f210515..fab6e21 100644 (file)
--- a/lustre/tests/sanity-quota.sh
+++ b/lustre/tests/sanity-quota.sh
@@ -746,7 +746,7 @@ test_6() {
        echo "  Remove filea to let OST0 release quota"
        rm -f $FILEA
 
-        if at_is_valid && at_is_enabled; then
+        if at_is_enabled; then
            timeout=$(at_max_get mds)
         else
            timeout=$(lctl get_param -n timeout)