diff --git a/ChangeLog b/ChangeLog
index 3b1c493..4b0f4f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1 +1,198254 @@
-ChangeLog is maintained by "git log".
+commit 8b7aee4f5419552ee4db7a05e8623cee00dd4d2f
+Author: Shyam <srangana@redhat.com>
+Date:   Tue Jun 6 09:17:30 2017 -0400
+
+    doc: Create release notes for 3.11.1
+    
+    Change-Id: I25988309111494e58bfb00c557262c8702928ab6
+    BUG: 1456850
+    Signed-off-by: Shyam <srangana@redhat.com>
+    Reviewed-on: https://review.gluster.org/17480
+    Smoke: Gluster Build System <jenkins@build.gluster.org>
+    CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
+    Reviewed-by: Amar Tumballi <amarts@redhat.com>
+
+commit c5ca4e8981bcf6a854eb3f708aa96fe6ff1f8e05
+Author: Shyamsundar Ranganathan <srangana@redhat.com>
+Date:   Mon Jun 26 16:23:45 2017 +0000
+
+    Revert "Revert "glusterd: disallow rebalance & remove-brick on a sharded volume""
+    
+    This is being reverted as a new bug around rebalance has been uncovered.
+    As a result we would like to retain the warning in the code and in the
+    release-notes.
+    
+    The new bug being, https://bugzilla.redhat.com/show_bug.cgi?id=1465075
+    
+    This reverts commit 9c5403587517b5922cb87bff75033839e96d56ab.
+    
+    Change-Id: Ifd38ae0a41539aeb67723eb3ee704c18c50571b0
+    BUG: 1465123
+    Signed-off-by: Shyam <srangana@redhat.com>
+    Reviewed-on: https://review.gluster.org/17631
+    Smoke: Gluster Build System <jenkins@build.gluster.org>
+    CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
+    Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
+
+commit f67dbab74a3d0a13a8f7ed31b8cc840c05042913
+Author: Susant Palai <spalai@redhat.com>
+Date:   Wed Jun 21 17:52:45 2017 +0530
+
+    cluster/rebalance: Use GF_XATTR_LIST_NODE_UUIDS_KEY to figure out local subvols.
+    
+    Afr has introduced a new key GF_XATTR_LIST_NODE_UUIDS_KEY,
+    through which rebalance will figure out its local subvolumes.(Reference

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