From: ericm <ericm>
Date: Wed, 28 Jan 2004 04:24:55 +0000 (+0000)
Subject: merge from HEAD (20040128)
X-Git-Tag: v1_7_100~1^368~27
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=dae33ee0447014e8f4086d6bb12f0582fd186caf;p=fs%2Flustre-release.git

merge from HEAD (20040128)

there's a lot of confliction in portals/knals/qswnal/qswnal_cb.c, need
Eric Barton check it more.
---

diff --git a/lustre/tests/.RC_CURRENT.tag b/lustre/tests/.RC_CURRENT.tag
index 427e007..738c3ee 100644
--- a/lustre/tests/.RC_CURRENT.tag
+++ b/lustre/tests/.RC_CURRENT.tag
@@ -1 +1 @@
-RC_1_1_0_28
+RC_1_1_0_36