From 4c740a705c27d4db619b970701f2ec0b87105494 Mon Sep 17 00:00:00 2001
From: lsy <lsy>
Date: Fri, 25 Mar 2005 06:48:39 +0000
Subject: [PATCH] Merge b1_4_quota from b1_4 (20050325_1039)

+	- mdc_enqueue does not need max_mds_easize request buffer on send (5707)
+	- swab llog records of type '0' so we get proper header size/idx (5861)
+	- send llog cancel req to DLM cancel portal instead of cb portal (5515)
+	- allow --write-conf on an MDS with different nettype than client (5619)
+	- don't write config llogs to MDS for mounts not from that MDS (5617)
+	- lconf should create multiple TCP connections from a client (5201)
+	- init scripts are now turned off by default; run chkconfig --on
+	  lustre and chkconfig --on lustrefs to use them
+	- fix deadlock in obdfilter statistics vs. object create (5811)
+	- use time_{before,after} to avoid timer jiffies wrap (5882)
+	- shutdown --force/--failover stability (3607,3651,4797,5203,4834)
+	- Do not leak request if server was not able to process it (5154)
+	- If mds_open unable to find parent dir, make that negative lookup(5154)
+	- support for RHEL4 kernel on i686 (5773)
+	- provide error messages when incompatible logs are encountered (5898)

since b1_4_bgl landed on b1_4, b1_4_quota starts to use the same branch of portals.
---
 build/buildcvs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/buildcvs b/build/buildcvs
index feb58a2..17ad797 100644
--- a/build/buildcvs
+++ b/build/buildcvs
@@ -22,7 +22,7 @@ case "$lustretag" in
 	portalstag="b1_2"
 	;;
 
-    b1_4 | b1_4_bgl)
+    b1_4 | b1_4_bgl | b1_4_quota)
 	portalstag="b1_4_bgl"
 	;;
 
-- 
1.8.3.1