diff --git a/ChangeLog b/ChangeLog
index 3b1c493..a310a2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1 +1,157864 @@
-ChangeLog is maintained by "git log".
+commit ccdfa49c90d0adfd32f9f6d3443e8762e9cd6b0e
+Author: Atin Mukherjee <amukherj@redhat.com>
+Date:   Wed Aug 5 16:02:49 2015 +0530
+
+    glusterd: improve error logs for unsupported clients
+    
+    Backport of http://review.gluster.org/11831
+    
+    Change-Id: I90be46a7b25cc3efd0e61c9a145852e9027f5f64
+    BUG: 1302521
+    Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
+    Reviewed-on: http://review.gluster.org/11831
+    Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
+    Tested-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
+    Smoke: Gluster Build System <jenkins@build.gluster.com>
+    CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
+    Reviewed-by: Prashanth Pai <ppai@redhat.com>
+    Reviewed-by: Kaushal M <kaushal@redhat.com>
+    NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
+    Reviewed-on: http://review.gluster.org/13305
+
+commit 204115c58622b5a15e1de8b6a909d77fdb49a226
+Author: N Balachandran <nbalacha@redhat.com>
+Date:   Mon Jan 25 13:27:42 2016 +0530
+
+    cluster/tier: Ignore quota-deem-statfs for watermark calculation
+    
+    The tier process watermark calculations were incorrect when the
+    quota-deem-statfs option was enabled. We now ignore this while
+    calculating hot tier usage to determine watermark levels.
+    
+    Change-Id: I308bc24432e2fa5ad1d5703e80fc391433538bbb
+    BUG: 1302012
+    > Signed-off-by: N Balachandran <nbalacha@redhat.com>
+    > Reviewed-on: http://review.gluster.org/13288
+    > Smoke: Gluster Build System <jenkins@build.gluster.com>
+    > Reviewed-by: mohammed rafi  kc <rkavunga@redhat.com>
+    > Tested-by: mohammed rafi  kc <rkavunga@redhat.com>
+    > CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
+    > Reviewed-by: Dan Lambright <dlambrig@redhat.com>
+    > NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
+    > Tested-by: Dan Lambright <dlambrig@redhat.com>
+    (cherry picked from commit 9ce86c63e349eaafbd923b0b541d75e929ecbae7)
+    Signed-off-by: Nithya Balachandran <nbalacha@redhat.com>

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