diff --git a/ChangeLog b/ChangeLog
index 3b1c493..53e67e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1 +1,203914 @@
-ChangeLog is maintained by "git log".
+commit 02d9b26502839d1439132925b72d03b2b6306482
+Author: Jiffin Tony Thottan <jthottan@redhat.com>
+Date:   Mon Sep 11 16:50:12 2017 +0530
+
+    doc : release-notes for GlusterFS-3.12.1
+    
+    Change-Id: Id852cec1a68966356d85856fb93cabcc122bb7ee
+    BUG: 1488560
+    Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
+    Reviewed-on: https://review.gluster.org/18258
+    CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
+    Smoke: Gluster Build System <jenkins@build.gluster.org>
+    Reviewed-by: Shyamsundar Ranganathan <srangana@redhat.com>
+
+commit c283620b40cbdeeeedfb80bc9822928630ad5905
+Author: Ravishankar N <ravishankar@redhat.com>
+Date:   Mon Sep 4 19:33:22 2017 +0530
+
+    afr: heal metadata in discover code path
+    
+    Combined backport of https://review.gluster.org/17850 and
+    https://review.gluster.org/18187
+    
+    During graph switch, if fuse sends nameless (gfid) lookups, afr takes
+    the discover code path to serve it. If there are pending metadata heals,
+    they do not happen unless an inode refresh happens as a part of
+    discover (which is not guaranteed to happen always).
+    
+    This patch fixes it by attempting metadata heal as a part of discover,
+    just like how it is done in lookup code path.
+    
+    Change-Id: I87c493045b9225741cad173bf3f645848697032e
+    BUG: 1488168
+    Signed-off-by: Ravishankar N <ravishankar@redhat.com>
+    Reviewed-on: https://review.gluster.org/18202
+    Smoke: Gluster Build System <jenkins@build.gluster.org>
+    CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
+    Reviewed-by: Karthik U S <ksubrahm@redhat.com>
+    Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
+    Reviewed-by: jiffin tony Thottan <jthottan@redhat.com>
+
+commit 4867647db935439abdd8fb19d39416ce1d83b081
+Author: Raghavendra G <rgowdapp@redhat.com>
+Date:   Tue Aug 29 15:07:53 2017 +0530

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