Update changelog section to 1.8.5

diff --git a/ldiskfs/ChangeLog b/ldiskfs/ChangeLog
index 2a5455e..9ea1fac 100644 (file)
--- a/ldiskfs/ChangeLog
+++ b/ldiskfs/ChangeLog
@@ -1,3 +1,8 @@
+2010-xx-xx Oracle, Inc.
+       * version 3.1.4
+
+-------------------------------------------------------------------------------
+
 2010-07-31 Oracle, Inc.
        * version 3.1.3
 

diff --git a/ldiskfs/configure.ac b/ldiskfs/configure.ac
index fdbfe9f..063e961 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.1.3, [https://bugzilla.lustre.org/])
+AC_INIT([Lustre ldiskfs], 3.1.4, [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 e884f19..8bcdbff 100644 (file)
--- a/lnet/ChangeLog
+++ b/lnet/ChangeLog
@@ -1,3 +1,20 @@
+2010-xx-xx Oracle, Inc.
+       * version 1.8.5
+       * 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.3, 1.4.1, 1.4.2 and 1.5.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-31 Oracle, Inc.
        * version 1.8.4
        * Support for networks:

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index fa4f248..08d92b2 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -1,3 +1,20 @@
+2010-xx-xx Oracle, Inc.
+       * version 1.8.5
+       * Support for kernels:
+         2.6.16.60-0.42.8 (SLES 10),
+         2.6.27.39-0.3.1 (SLES11),
+         2.6.18-194.3.1.el5 (RHEL 5)
+         2.6.18-194.3.1.0.1.el5 (OEL 5)
+       * Client support for unpatched kernels:
+         (see http://wiki.lustre.org/index.php?title=Patchless_Client)
+         2.6.16 - 2.6.30 vanilla (kernel.org)
+       * Recommended e2fsprogs version: 1.41.10-sun2
+       * The async journal commit feature (bug 19128) and the cancel
+         lock before replay feature (bug 16774) are disabled by default.
+
+
+-------------------------------------------------------------------------------
+
 2010-07-31 Oracle, Inc.
        * version 1.8.4
        * Support for kernels:

diff --git a/lustre/autoconf/lustre-version.ac b/lustre/autoconf/lustre-version.ac
index c4b8277..2cebcc0 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],[8])
 m4_define([LUSTRE_PATCH],[4])
-m4_define([LUSTRE_FIX],[0])
+m4_define([LUSTRE_FIX],[50])
 # Note: we're starting prerelease versions at 50 this time.
 
 dnl # don't forget to update the service tags info