From 07a57a8f9fb7e1783a8a3c1115058c945fec9467 Mon Sep 17 00:00:00 2001
From: johann <johann@sun.com>
Date: Tue, 11 May 2010 13:20:22 +0200
Subject: [PATCH] Add missing changelog entries

---
 ldiskfs/ChangeLog    |  4 +++-
 ldiskfs/configure.ac |  2 +-
 lustre/ChangeLog     | 49 +++++++++++++++++++++++++++++++++++++++++--------
 3 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/ldiskfs/ChangeLog b/ldiskfs/ChangeLog
index 48dfcb8..e2a3144 100644
--- a/ldiskfs/ChangeLog
+++ b/ldiskfs/ChangeLog
@@ -1,10 +1,12 @@
 2010-04-30 Oracle, Inc.
 	* version 3.1.3
 
+Severity   : normal
+Bugzilla   : 18456
+Description: Reduce group prealloc size and skip groups with little free space.
 
 -------------------------------------------------------------------------------
 
-
 2010-04-30 Oracle, Inc.
 	* version 3.1.2
 
diff --git a/ldiskfs/configure.ac b/ldiskfs/configure.ac
index 6644fe5..325ec6f 100644
--- 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.0.9, [https://bugzilla.lustre.org/])
+AC_INIT([Lustre ldiskfs], 3.1.3, [https://bugzilla.lustre.org/])
 AC_CONFIG_SRCDIR([lustre-ldiskfs.spec.in])
 
 # Don't look for install-sh, etc. in ..
diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 93955c9..7a558376 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -12,6 +12,47 @@ tbd        Oracle, Inc.
 	* The async journal commit feature (bug 19128) and the cancel
 	  lock before replay feature (bug 16774) are disabled by default.
 
+Severity   : enhancement
+Bugzilla   : 22194
+Description: lfs quota output is not very convenient for awk/sed-parsing
+Details    : Some positions if lfs quota output table could be empty or
+	     non-empty which made it hard to parse it with scripts, now
+	     a dash is put instead of space where there is not supposed
+	     to be any data.
+
+Severity   : normal
+Bugzilla   : 22360
+Description: file operations after eviction have successful return values
+Details    : use vfs ->flush callback to return any pending async errors
+	     on file close.
+
+Severity   : normal
+Bugzilla   : 20433
+Description: mdsrate fails to write after 1.3+M files opened
+Details    : decrease memory usage on clients by recycling dentries and
+	     inodes.
+
+Severity   : normal
+Bugzilla   : 17382
+Description: obdfilter-survey gives unreasonably high numbers
+Details    : Wait for all threads to complete when running test_brw.
+
+Severity   : normal
+Bugzilla   : 22299
+Description: do not set lustre read_only device when server umount and keep
+	     client records for recoverable ones
+
+Severity   : normal
+Bugzilla   : 22656
+Description: Prevent failover nids from registering with MGS first
+
+Severity   : normal
+Bugzilla   : 22241
+Description: move sync_on_lock_cancel tunable to the obdfilter layer
+Details    : move the tunable to trigger a journal flush on lock cancel from
+	     the ost layer to the obdfilter layer. This tunable is useful
+	     when using the async journal commit feature.
+
 -------------------------------------------------------------------------------
 
 2010-04-30 Oracle, Inc.
@@ -28,14 +69,6 @@ tbd        Oracle, Inc.
 	* The async journal commit feature (bug 19128) and the cancel
 	  lock before replay feature (bug 16774) are disabled by default.
 
-Severity   : enhancement
-Bugzilla   : 22194
-Description: lfs quota output is not very convenient for awk/sed-parsing
-Details    : Some positions if lfs quota output table could be empty or
-	     non-empty which made it hard to parse it with scripts, now
-	     a dash is put instead of space where there is not supposed
-	     to be any data.
-
 Severity   : major
 Bugzilla   : 22177
 Description: open-unlinked directories trigger MDS LBUG
-- 
1.8.3.1