diff --git a/ChangeLog b/ChangeLog
index 3b1c493..3f2c71d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1 +1,194452 @@
-ChangeLog is maintained by "git log".
+commit d393ff62094b41d25b0d2f3734d9ab474a9f51a3
+Author: Raghavendra Talur <rtalur@redhat.com>
+Date:   Thu Jun 1 04:39:24 2017 +0530
+
+    doc: release notes for 3.10.4
+    
+    Change-Id: I63d5125929f0e187f3e2f872201981e3497a094c
+    BUG: 1457558
+    Signed-off-by: Raghavendra Talur <rtalur@redhat.com>
+    Reviewed-on: https://review.gluster.org/17433
+    CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
+    Smoke: Gluster Build System <jenkins@build.gluster.org>
+
+commit b582c9a28cc81a593fbedc8fba7b18ae3095e11e
+Author: Ravishankar N <ravishankar@redhat.com>
+Date:   Sun Jun 25 21:50:09 2017 +0530
+
+    glfsheal: prevent background self-heals
+    
+    Problem:
+    For a file in gfid split-brain, the parent directory ('/' during
+    testing) was detected as possibly undergoing heal instead of split-brain
+    in `heal-info` output. Also, it was not being displayed in `info
+    split-brain` output for the same reason. The problem was that when `glfsheal`
+    was run, lookup on '/' triggered a background self-heal due to which processing
+    of '/' during `heal info` failed to acquire locks with errno=EAGAIN.
+    
+    Fix:
+    Set background-self-heal-count to zero while launching glfsheal.
+    
+    > Reviewed-on: https://review.gluster.org/13772
+    > 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>
+    > Reviewed-by: Jeff Darcy <jeff@pl.atyp.us>
+    (cherry picked from commit b4db625d0ccb4fdc6537ed9f6e8ebeaffd1c4873)
+    
+    Change-Id: I153a7c75af71f213a4eefacf504a0f9806c528a5
+    BUG: 1467269
+    Signed-off-by: Ravishankar N <ravishankar@redhat.com>
+    Reviewed-on: https://review.gluster.org/17676
+    Smoke: Gluster Build System <jenkins@build.gluster.org>
+    CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
+    Reviewed-by: Raghavendra Talur <rtalur@redhat.com>

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