diff --git a/ChangeLog b/ChangeLog
index 3b1c493..ddc8ba0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1 +1,117361 @@
-ChangeLog is maintained by "git log".
+commit 52f6c664a27cddad37196c91fbb4c03d7da774b3
+Author: Manikandan Selvaganesh <mselvaga@redhat.com>
+Date:   Mon Jan 11 18:08:27 2016 +0530
+
+    quota : fix could not start auxiliary mount issue
+    
+    In versions older than 3.7, when trying to enable
+    quota, the following message appears :"quota: Could
+    not start quota auxiliary mount". It was because,
+    /var/run/gluster was not getting created in cli side.
+    In 3.7, the code has been moved to glusterd and we are
+    making use of sys_mkdir.
+    
+    3.5 fix -> http://review.gluster.org/#/c/13215/
+    
+    > Change-Id: Id4360409f76b57c0f676fe2b859f3647c4340575
+    > BUG: 1117888
+    > Signed-off-by: Manikandan Selvaganesh <mselvaga@redhat.com>
+    
+    Change-Id: Id4360409f76b57c0f676fe2b859f3647c4340575
+    BUG: 1302541
+    Signed-off-by: Manikandan Selvaganesh <mselvaga@redhat.com>
+    Reviewed-on: http://review.gluster.org/13308
+    Smoke: Gluster Build System <jenkins@build.gluster.com>
+    Reviewed-by: Niels de Vos <ndevos@redhat.com>
+    Reviewed-by: Vijaikumar Mallikarjuna <vmallika@redhat.com>
+    CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
+    NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
+
+commit 74dedc441c2414de0bbfd12cf0eca366bd9b939d
+Author: Manikandan Selvaganesh <mselvaga@redhat.com>
+Date:   Thu Dec 17 10:55:37 2015 +0530
+
+    quota : avoid "contribution node is empty" error logs
+    
+    In versions older than 3.7, "contribution node list is empty which is
+    an error" gets logged numerous number of times. It is completely fixed
+    in 3.7. Since the entire marker and quota code has almost been
+    refactored, it is hard to backport the complete fix and also it could
+    not be fixed with the older approach. As a temporary fix, to avoid
+    numerous logs, the patch just supresses the log level.
+    
+    3.5 fix: http://review.gluster.org/#/c/12990/
+    

More commit messages for this ChangeLog can be found at
https://forge.gluster.org/glusterfs-core/glusterfs/commits/v3.6.9
