Merge branch 'master' of git.lustre.org:prime/lustre

diff --git a/ldiskfs/ChangeLog b/ldiskfs/ChangeLog
index d9193ed..2b3475a 100644 (file)
--- a/ldiskfs/ChangeLog
+++ b/ldiskfs/ChangeLog
@@ -1,3 +1,14 @@
+TBD  Oracle, Inc.
+        * version 3.3.0
+
+Severity   : enhancement
+Bugzilla   : 17670
+Description: FID_in_Dirent feature for OSD.
+Details    : Support for storing the FID in the directory entry has
+             been added to ext3 and ext4.
+
+-------------------------------------------------------------------------------
+
 2010-07-15  Oracle, Inc.
         * version 3.2.0
 
@@ -8,7 +19,7 @@ Details    : Support for storing the FID in the directory entry has
              been added to ext3 and ext4.
 
 -------------------------------------------------------------------------------
-       
+
 2009-11-05  Sun Microsystems, Inc.
        * version 3.1.0
 

diff --git a/ldiskfs/configure.ac b/ldiskfs/configure.ac
index 1f38551..e20d087 100644 (file)
--- a/ldiskfs/configure.ac
+++ b/ldiskfs/configure.ac
@@ -1,6 +1,6 @@
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([Lustre ldiskfs], 3.2.0, [https://bugzilla.lustre.org/])
+AC_INIT([Lustre ldiskfs], 3.3.0, [https://bugzilla.lustre.org/])
 AC_CONFIG_SRCDIR([lustre-ldiskfs.spec.in])
 
 # Don't look for install-sh, etc. in ..

diff --git a/lnet/ChangeLog b/lnet/ChangeLog
index c835fb2..9764c12 100644 (file)
--- a/lnet/ChangeLog
+++ b/lnet/ChangeLog
@@ -1,3 +1,19 @@
+TBD Oracle, Inc.
+       * version 2.1.0
+       * Support for networks:
+        socklnd   - any kernel supported by Lustre,
+        qswlnd    - Qsnet kernel modules 5.20 and later,
+        openiblnd - IbGold 1.8.2,
+        o2iblnd   - OFED 1.1, 1.2.0, 1.2.5, 1.3, and 1.4.1
+        viblnd    - Voltaire ibhost 3.4.5 and later,
+        ciblnd    - Topspin 3.2.0,
+        iiblnd    - Infiniserv 3.3 + PathBits patch,
+        gmlnd     - GM 2.1.22 and later,
+        mxlnd     - MX 1.2.10 or later,
+        ptllnd    - Portals 3.3 / UNICOS/lc 1.5.x, 2.0.x
+
+-------------------------------------------------------------------------------
+
 2010-07-15  Sun Microsystems, Inc.
        * version 2.0.0
        * Support for networks:

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 95f5e4e..e23a18c 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -1,3 +1,19 @@
+TBD  Oracle, Inc.
+       * version 2.1.0
+       * Server support for kernels:
+         2.6.18-164.11.1.el5 (RHEL 5)
+         2.6.18-164.11.1.0.1.el5 (OEL 5)
+       * Client support for unpatched kernels:
+        (see http://wiki.lustre.org/index.php?title=Patchless_Client)
+         2.6.18-164.11.1.el5 (RHEL 5),
+         2.6.18-164.11.1.0.1.el5 (OEL 5)
+         2.6.16.60-0.42.8 (SLES 10),
+         2.6.27.19-5 (SLES11)
+        2.6.29.4-167.fc11 (FC11)
+       * Recommended e2fsprogs version: 1.41.10-sun2
+
+--------------------------------------------------------------------------------
+
 2010-07-15  Oracle, Inc.
        * version 2.0.0
        * Server support for kernels:

diff --git a/lustre/autoconf/lustre-version.ac b/lustre/autoconf/lustre-version.ac
index 7fcf412..bc0dee2 100644 (file)
--- a/lustre/autoconf/lustre-version.ac
+++ b/lustre/autoconf/lustre-version.ac
@@ -1,13 +1,13 @@
 m4_define([LUSTRE_MAJOR],[2])
 m4_define([LUSTRE_MINOR],[0])
-m4_define([LUSTRE_PATCH],[50])
-m4_define([LUSTRE_FIX],[0])
+m4_define([LUSTRE_PATCH],[0])
+m4_define([LUSTRE_FIX],[51])
 
 dnl # don't forget to update the service tags info
-m4_define([CLIENT_URN],["LUSTRE-200-CLT"])
-m4_define([MDS_URN],["LUSTRE-200-MDS"])
-m4_define([MGS_URN],["LUSTRE-200-MGS"])
-m4_define([OSS_URN],["LUSTRE-200-OSS"])
+m4_define([CLIENT_URN],["LUSTRE-210-CLT"])
+m4_define([MDS_URN],["LUSTRE-210-MDS"])
+m4_define([MGS_URN],["LUSTRE-210-MGS"])
+m4_define([OSS_URN],["LUSTRE-210-OSS"])
 
 dnl # liblustre delta is 0.0.1.32 , next version with fixes is ok, but
 dnl # after following release candidate/beta would spill this warning already.