Branch b1_6

b=13915

lustre/ChangeLog

@@ -118,6 +118,12 @@ Details    : In reconstruct_* functions, LASSERTs on both the data supplied by
 		'tunefs.lustre --param="mdt.quota_type=ug1" $MDTDEV'.
 	 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