Start of 2.2 development, updated version to 2.1.50

Change-Id: Ibaca591c4db2b839ece2419b77404cdcd869d843
Signed-off-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 050059f..77e0d31 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -1,3 +1,24 @@
+TBD Whamcloud, Inc.
+       * version 2.2.0
+       * Server support for kernels:
+         2.6.18-238.19.1.el5 (RHEL5)
+         2.6.32-131.6.1.el6 (RHEL6)
+       * Client support for unpatched kernels:
+         (see http://wiki.lustre.org/index.php?title=Patchless_Client)
+         2.6.18-238.19.1.el5 (RHEL5)
+         2.6.32-131.6.1.el6 (RHEL6)
+         2.6.29.4-167.fc11  (FC11)
+         2.6.16.60-0.69.1 (SLES10)
+         2.6.27.19-5      (SLES11)
+       * Recommended e2fsprogs version: 1.41.90.wc3
+       * NFS export disabled when stack size < 8192. Since the NFSv4 export of
+         Lustre filesystem with 4K stack may cause a stack overflow. For more
+         information, please refer to bugzilla 17630.
+       * NFSv4 reexport requires Lustre client on the re-exporting nodes to be
+         mounted with "32bitapi" mount option
+
+--------------------------------------------------------------------------------
+
 09-16-2011 Whamcloud, Inc.
        * version 2.1.0
        * Server support for kernels:

diff --git a/lustre/autoconf/lustre-version.ac b/lustre/autoconf/lustre-version.ac
index 6ddef8c..49543a2 100644 (file)
--- a/lustre/autoconf/lustre-version.ac
+++ b/lustre/autoconf/lustre-version.ac
@@ -1,6 +1,6 @@
 m4_define([LUSTRE_MAJOR],[2])
 m4_define([LUSTRE_MINOR],[1])
-m4_define([LUSTRE_PATCH],[0])
+m4_define([LUSTRE_PATCH],[50])
 m4_define([LUSTRE_FIX],[0])
 
 dnl # don't forget to update the service tags info