Prepare for Build 36.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 0df1b01..da94fa7 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -14,6 +14,25 @@ tbd  Sun Microsystems, Inc.
 
 
 Severity   : normal
+Bugzilla   : 21259
+Description: lfs check only allowed for root
+Details    : Code cleanups and added a regresion test of non-root use of
+            lfs check.
+
+Severity   : normal
+Bugzilla   : 21879
+Description: MDS Oopses in ptlrpc_dispatch_difficult_reply()/__list_add()
+Details    : Fix hr->hr_index overload.
+
+Severity   : normal
+Bugzilla   : 19742
+Description: Fix FIEMAP functionality.
+
+Severity   : normal
+Bugzilla   : 19808
+Description: FC11 patchless client support added
+
+Severity   : normal
 Bugzilla   : 21632
 Description: Update RHEL5.4 kernel to 2.6.18-164.11.1.el5 and
             OEL5.4 kernel to 2.6.18-164.11.1.0.1.el5.

diff --git a/lustre/autoconf/lustre-version.ac b/lustre/autoconf/lustre-version.ac
index cbc3e4f..d391adb 100644 (file)
--- a/lustre/autoconf/lustre-version.ac
+++ b/lustre/autoconf/lustre-version.ac
@@ -1,7 +1,7 @@
 m4_define([LUSTRE_MAJOR],[1])
 m4_define([LUSTRE_MINOR],[10])
 m4_define([LUSTRE_PATCH],[0])
-m4_define([LUSTRE_FIX],[35])
+m4_define([LUSTRE_FIX],[36])
 
 dnl # don't forget to update the service tags info
 m4_define([CLIENT_URN],["LUSTRE-200-CLT"])