diff --git a/ChangeLog b/ChangeLog
index 3b1c493..5da6e97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1 +1,195339 @@
-ChangeLog is maintained by "git log".
+commit dc5a26bbb44adf9c978cf55512f6f6d33acfccab
+Author: Shyam <srangana@redhat.com>
+Date:   Mon May 8 14:01:34 2017 -0400
+
+    doc: Added initial version of 3.11.0 release-notes
+    
+    This is just a skeleton, each feature further needs to provide
+    additional content as noted.
+    
+    Further list of bugs fixed needs to be added to the list.
+    
+    Change-Id: Id909cd4559c8d828eb9a77a0b4f27b7b59dfca4a
+    Signed-off-by: Shyam <srangana@redhat.com>
+    Reviewed-on: https://review.gluster.org/17207
+    CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
+    NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
+    Smoke: Gluster Build System <jenkins@build.gluster.org>
+
+commit b6cc5261d5809aa509eecd082aefb7a0a14ca74b
+Author: Kevin Vigor <kvigor@fb.com>
+Date:   Tue Mar 21 08:23:25 2017 -0700
+
+    Halo Replication feature for AFR translator
+    
+    	Backport of https://review.gluster.org/16177
+    		    https://review.gluster.org/17174
+    
+    Merged both these patches to make sure IPV6 changes don't make it to 3.11 at all.
+    
+    Summary:
+    Halo Geo-replication is a feature which allows Gluster or NFS clients to write
+    locally to their region (as defined by a latency "halo" or threshold if you
+    like), and have their writes asynchronously propagate from their origin to the
+    rest of the cluster.  Clients can also write synchronously to the cluster
+    simply by specifying a halo-latency which is very large (e.g. 10seconds) which
+    will include all bricks.
+    
+    In other words, it allows clients to decide at mount time if they desire
+    synchronous or asynchronous IO into a cluster and the cluster can support both
+    of these modes to any number of clients simultaneously.
+    
+    There are a few new volume options due to this feature:
+      halo-shd-latency:  The threshold below which self-heal daemons will
+      consider children (bricks) connected.

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