From: rread <rread>
Date: Mon, 14 Jun 2004 19:42:36 +0000 (+0000)
Subject: Land b_bug1742 onto b1_4_smallfix (20040614_1231)
X-Git-Tag: v1_7_100~1^38~7
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=5391e38aa9c777101a00bd7e7275d920188371e6;p=fs%2Flustre-release.git

Land b_bug1742 onto b1_4_smallfix (20040614_1231)

  1742 - allow clients to reconnect durign replay
  3570 - resend bulk reqs
  3515 - only evict clients above gap after recovery aborts
  3554 - fix cond_resched()
---

diff --git a/lustre/tests/cfg/local.sh b/lustre/tests/cfg/local.sh
index 9d7ca4b..4cd02ae 100644
--- a/lustre/tests/cfg/local.sh
+++ b/lustre/tests/cfg/local.sh
@@ -25,7 +25,7 @@ OSTDEV=${OSTDEV:-$ROOT/tmp/ost1-`hostname`}
 OSTSIZE=${OSTSIZE:-50000}
 FSTYPE=${FSTYPE:-ext3}
 TIMEOUT=${TIMEOUT:-20}
-UPCALL=${UPCALL:-$PWD/replay-single-upcall.sh}
+UPCALL=${UPCALL:-DEFAULT}
 
 STRIPE_BYTES=${STRIPE_BYTES:-524288}
 STRIPES_PER_OBJ=${STRIPES_PER_OBJ:-0}