Minor b1_4 changelog revision; a few items were in the 1.4.0 list, when

they did not, in fact, make it.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index daf8014..5030968 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -1,21 +1,31 @@
 tbd         Cluster File Systems, Inc. <info@clusterfs.com>
        * version 1.4.1
        * bug fixes
+        - don't keep a lock reference when lock is not granted (4238)
+        - unsafe list practices (rarely) led to infinite eviction loop (4908)
        - add per-fs limit of Lustre pages in page cache, avoid OOM (4699)
+        - drop import inflight refcount on signal_completed_replay error (5255)
+        - unlock page after async write error during send (3677)
+        - handle missing objects in filter_preprw_read properly (5265)
        - no transno return for symlink open, don't save no-trasno open (3440)
        - don't try to complete elan receive that already failed (4012)
        - free RPC server reply state on error (5406)
        * miscellania
+        - service request history (4965)
+        - put {ll,lov,osc}_async_page structs in a single slab (4699)
+        - create an "evict_client" /proc entry on OSTs, like the MDS has
         - fix ppc64/x86_64 spec to use %{_libdir} instead of /usr/lib (5389)
 
 2004-11-23  Cluster File Systems, Inc. <info@clusterfs.com>
        * version 1.4.0
        * bug fixes
-        - changes from 1.2.9
+        - send OST transaction number in read/write reply to free req (4966)
+        - don't ASSERT in ptl_send_rpc() if we run out of memory (5119)
+        - lock /proc/sys/portals/routes internal state, avoiding oops (4827)
+        - the watchdog thread now runs as interruptible (5246)
        - flock/lockf fixes (but it's still disabled, pending 5135)
        - don't use EXT3 constants in llite code (5094)
        - memory shortage at startup could cause assertion (5176)
-       - don't keep a lock reference when lock is not granted (4238)
        * miscellania
        - reorganization of lov code
        - single portals codebase
@@ -23,9 +33,6 @@ tbd         Cluster File Systems, Inc. <info@clusterfs.com>
        - add extents/mballoc support (5025)
        - direct I/O reads in the obdfilter (4048)
        - kernel patches from LNXI for 2.6 (bluesmoke, perfctr, mtd, kexec)
-       - service request history (4965)
-       - put {ll,lov,osc}_async_page structs in a single slab (4699)
-       - create an "evict_client" /proc entry on OSTs, like the MDS has
 
 tbd         Cluster File Systems, Inc. <info@clusterfs.com>
        * version 1.2.9