Master is now for upcoming 2.3.0 release

Updates changelog and lustre version.
New tag 2.2.50

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

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index f47afd6..0c456d2 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -1,4 +1,23 @@
 TBD Whamcloud, Inc.
+       * version 2.3.0
+       * See http://wiki.whamcloud.com/display/PUB/Lustre+Support+Matrix
+       * Server support for kernels:
+         2.6.32-220.4.2.el6  (RHEL6)
+       * Client support for unpatched kernels:
+         2.6.32-220.4.2.el6  (RHEL6)
+         2.6.27.19-5         (SLES11)
+         2.6.18-238.19.1.el5 (RHEL5)
+         2.6.16.60-0.69.1    (SLES10)
+       * Recommended e2fsprogs version: 1.41.90.wc4
+       * NFS export disabled when stack size < 8192 (32-bit Lustre clients),
+         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 to 32-bit NFS client nodes requires Lustre client on
+         the re-exporting nodes to be mounted with "32bitapi" mount option
+
+--------------------------------------------------------------------------------
+
+04-30-2012 Whamcloud, Inc.
        * version 2.2.0
        * See http://wiki.whamcloud.com/display/PUB/Lustre+Support+Matrix
        * Server support for kernels:

diff --git a/lustre/autoconf/lustre-version.ac b/lustre/autoconf/lustre-version.ac
index 4169dba..f0b9173 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],[56])
+m4_define([LUSTRE_MINOR],[2])
+m4_define([LUSTRE_PATCH],[50])
 m4_define([LUSTRE_FIX],[0])
 
 dnl # liblustre delta is 0.0.1.32 , next version with fixes is ok, but