Branch b1_6

b=13915

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index af05d27..289bbc6 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -119,6 +119,12 @@ Details    : In reconstruct_* functions, LASSERTs on both the data supplied by
         For more information, please refer to bugzilla 13904.
 
 Severity   : normal
+Bugzilla   : 13915
+Description: lfs support for human-readable quota grace time strings
+Details    : lfs setquota -t and lfs quota -t represent quota grace times
+             in "XXwXXdXXhXXmXXs" format instead of large values in seconds
+
+Severity   : normal
 Frequency  : always with o2ib 1.3 and sles10
 Bugzilla   : 15870
 Description: fix build with SLES10 and o2ib v3.