diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 2e13f41873f11256c4f25437331755448b9d3eea..f4f8c00b951c6edaf93c930bee0296f4c2632042 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -785,6 +785,25 @@ Details    : When race occurs in glimpse handler and nothing is returned,
              we do not reprocess the queue after lock cancel, and that leads
 	     to a stall until next activity on a resource
 
+Severity   : normal
+Frequency  : failover with quotaon
+Bugzilla   : 14840
+Description: during mds failovers with quota on, OSTs got into deadlock state
+	     and causing dumpstack.
+Details	   : for every quota slave, at any time, there is only one quota req
+	     is sent to quota master for every uid/gid. Before that quota req
+	     returns, all the thread relative to the same uid/gid will wait. 
+	     So if the quota req is lost because mds failovers or any other
+	     reasons, this bug will be hit. Now, dqacq_interpret() will handle
+	     quota reqs who time out. 
+
+Severity   : enhancement
+Frequency  : always
+Bugzilla   : 14783
+Description: when quota slave checks if quota is enough, there is an unnecessary
+	     wait.
+Details	   : place this wait on necessary place instead of always waiting.
+
 --------------------------------------------------------------------------------
 
 2007-12-07         Cluster File Systems, Inc. <info@clusterfs.com>