From: anserper <anserper>
Date: Sun, 25 May 2008 19:42:45 +0000 (+0000)
Subject: Branch b1_6
X-Git-Tag: v1_8_0_110~504
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=9d46b824fb136bdb3e865d67709bdf42eccf70ef;p=fs%2Flustre-release.git

Branch b1_6
b=13915
---

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index af05d27..289bbc6 100644
--- 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.