diff --git a/ChangeLog b/ChangeLog
index 3b1c493..d3212d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1 +1,116534 @@
-ChangeLog is maintained by "git log".
+commit 50b0c7baad43dcd378a5740f154b38ec0ffe0f00
+Author: Kaushal M <kaushal@redhat.com>
+Date:   Tue Jul 7 12:52:30 2015 +0530
+
+    glusterd: Fix management encryption issues with GlusterD
+    
+      Backport of commit 01b82c6 from master
+    
+    Management encryption was enabled incorrectly in GlusterD leading to
+    issues of cluster deadlocks. This has been fixed with this commit. The
+    fix is in two parts,
+    
+    1. Correctly enable encrytion for the TCP listener in GlusterD and
+    re-enable own-threads for encrypted connections.
+      Without this, GlusterD could try to esatblish the blocking SSL
+      connects in the epoll thread, for eg. when handling friend updates,
+      which could lead to cluster deadlocks.
+    
+    2. Explicitly enable encryption for outgoing peer connections.
+      Without enabling encryption explicitly for outgoing connections was
+      causing SSL socket events to be handled in the epoll thread. Some
+      events, like disconnects during peer detach, could lead to connection
+      attempts to happen in the epoll thread, leading to deadlocks again.
+    
+    Change-Id: I438c2b43f7b1965c0e04d95c000144118d36272c
+    BUG: 1241785
+    Signed-off-by: Kaushal M <kaushal@redhat.com>
+    Reviewed-on: http://review.gluster.org/11612
+    Tested-by: Gluster Build System <jenkins@build.gluster.com>
+    Reviewed-by: Raghavendra Bhat <raghavendra@redhat.com>
+
+commit c7d8d2ea1e4ad9e247b5876cf17d3a6e0d9af9ad
+Author: Jeff Darcy <jdarcy@redhat.com>
+Date:   Wed Jul 8 09:52:15 2015 -0400
+
+    glusterd: use a real host name (instead of numeric) when we have one
+    
+    Change-Id: Ie9cc201204d3d613e3e585cab066a07283db902c
+    BUG: 1241275
+    Signed-off-by: Jeff Darcy <jdarcy@redhat.com>
+    Reviewed-on: http://review.gluster.org/11569
+    Tested-by: Gluster Build System <jenkins@build.gluster.com>
+    Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com>
+    Reviewed-by: Shyamsundar Ranganathan <srangana@redhat.com>

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