Branch b_release_1_8_0

Remove duplicate ChangeLog entry.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 339114c..43292b5 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -47,7 +47,7 @@ Severity   : enhancement
 Bugzilla   : 17974
 Description: add lazystatfs mount option to allow statfs(2) to skip down OSTs
 Details    : allow skip disconnected ost for send statfs request and hide error
-             in this case.
+            in this case.
 
 Severity   : normal
 Frequency  : rare, on llog test 6
@@ -67,29 +67,29 @@ Frequency  : rare, on failed llog setup
 Bugzilla   : 18896
 Descriptoin: don't leak obd reference on failed llog setup
 Details    : for failed llog setup - mgc forget call class_destroy_import for
-             client import, move destroy import to more generic place.
+            client import, move destroy import to more generic place.
 
 Severity   : normal
 Frequency  : rare
 Bugzilla   : 18902
 Descriptoin: allow kill process which wait statahead result
 Details    : for some reasons 'ls' can stick in waiting result from statahead,
-             in this case need way for kill this process.
+            in this case need way for kill this process.
 
 Severity   : normal
 Frequency  : rare, at shutdown
 Bugzilla   : 18773
 Descriptoin: panic at umount
 Details    : llap_shrinker can be raced with killing super block from list and
-             this produce panic with access to already freeded pointer
+            this produce panic with access to already freeded pointer
 
 Severity   : normal
 Frequency  : rare
 Bugzilla   : 18154
 Descriptoin: don't lose wakeup for imp_recovery_waitq
 Details    : recover_import_no_retry or invalidate_import and import_close can
-             both sleep on imp_recovery_waitq, but we was send only one wakeup
-             to sleep queue.
+            both sleep on imp_recovery_waitq, but we was send only one wakeup
+            to sleep queue.
 
 Severity   : normal
 Frequency  : rare
@@ -101,7 +101,7 @@ Severity   : normal
 Frequency  : rare
 Bugzilla   : 17972
 Descriptoin: stuck in cache_remove_extent() or panic with accessing to already
-             freed look.
+            freed look.
 Details    : release lock refernce only after add page to pages list.
 
 Severity   : normal
@@ -109,16 +109,16 @@ Frequency  : start MDS on uncleanly shutdowned MDS device
 Bugzilla   : 16839
 Descriptoin: ll_sync thread stay in waiting mds<>ost recovery finished
 Details    : stay in waiting mds<>ost recovery finished produce random bugs
-             due race between two ll_sync thread for one lov target. send 
-             ACTIVATE event only if connect realy finished and import have
-             FULL state.
+            due race between two ll_sync thread for one lov target. send 
+            ACTIVATE event only if connect realy finished and import have
+            FULL state.
 
 Severity   : normal
 Frequency  : always with long access acl
 Bugzilla   : 17636
 Descriptoin: mds can't pack reply with long acl.
 Details    : mds don't control size of acl but they limited by reint/getattr
-             reply buffer.
+            reply buffer.
 
 Severity   : normal
 Frequency  : start MDS on uncleanly shutdowned MDS device
@@ -423,12 +423,6 @@ Bugzilla   : 16037
 Description: Client runs out of low memory
 Details    : Consider only lowmem when counting initial number of llap pages
 
-Bugzilla   : 15825
-Description: Kernel BUG tries to release flock
-Details    : Lustre does not destroy flock lock before last reference goes
-            away. So always drop flock locks when client is evicted and
-            perform unlock regardless of successfulness of speaking to MDS.
-
 Severity   : normal
 Frequency  : occasional
 Bugzilla   : 15210
@@ -884,7 +878,7 @@ Frequency  : rare, during recovery
 Bugzilla   : 17895
 Description: Assertion failure in ldlm_lock_put
 Details    : Do not put cancelled locks into replay list, hold references on
-             locks in replay list
+            locks in replay list
 
 Severity   : critical
 Bugzilla   : 18695