diff --git a/ChangeLog b/ChangeLog
index 3b1c493..64978e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1 +1,182336 @@
-ChangeLog is maintained by "git log".
+commit c4057aa93eb751ce7860b1fa8923afb8d7b26aba
+Author: Niels de Vos <ndevos@redhat.com>
+Date:   Tue Jul 11 15:44:14 2017 +0200
+
+    doc: release-notes for GlusterFS-3.8.14
+    
+    BUG: 1464927
+    Change-Id: I2ce12274e4d0ed1135370341eacd9f9f66993559
+    Signed-off-by: Niels de Vos <ndevos@redhat.com>
+    Reviewed-on: https://review.gluster.org/17748
+    CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
+    Reviewed-by: Michael Scherer <misc@fedoraproject.org>
+    Smoke: Gluster Build System <jenkins@build.gluster.org>
+
+commit 96e7452155c3fd1b160a97d88c03f1bf31b0be97
+Author: Atin Mukherjee <amukherj@redhat.com>
+Date:   Sat Mar 18 16:29:10 2017 +0530
+
+    rpc: bump up conn->cleanup_gen in rpc_clnt_reconnect_cleanup
+    
+    Commit 086436a introduced generation number (cleanup_gen) to ensure that
+    rpc layer doesn't end up cleaning up the connection object if
+    application layer has already destroyed it. Bumping up cleanup_gen was
+    done only in rpc_clnt_connection_cleanup (). However the same is needed
+    in rpc_clnt_reconnect_cleanup () too as with out it if the object gets destroyed
+    through the reconnect event in the application layer, rpc layer will
+    still end up in trying to delete the object resulting into double free
+    and crash.
+    
+    Peer probing an invalid host/IP was the basic test to catch this issue.
+    
+    Cherry picked from commit 39e09ad1e0e93f08153688c31433c38529f93716:
+    > Change-Id: Id5332f3239cb324cead34eb51cf73d426733bd46
+    > BUG: 1433578
+    > Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
+    > Reviewed-on: https://review.gluster.org/16914
+    > Smoke: Gluster Build System <jenkins@build.gluster.org>
+    > NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
+    > Reviewed-by: Milind Changire <mchangir@redhat.com>
+    > CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
+    > Reviewed-by: Jeff Darcy <jeff@pl.atyp.us>
+    
+    Change-Id: Id5332f3239cb324cead34eb51cf73d426733bd46
+    BUG: 1462447

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