diff --git a/ChangeLog b/ChangeLog
index 3b1c493..a80fe08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1 +1,137717 @@
-ChangeLog is maintained by "git log".
+commit f266dc6be5b401a7a813adc958d978eb9207cd63
+Author: Anoop C S <achiraya@redhat.com>
+Date:   Fri May 29 16:33:09 2015 +0530
+
+    features/changelog: Remove inline keyword to avoid warnings (gcc v5.1.1)
+    
+            Backport of http://review.gluster.org/11004
+    
+    When compiled with gcc5, following warnings were displayed
+    and volume start failed:
+    
+    changelog-helpers.h:499:1: warning: inline function 'changelog_dispatch_event'
+    declared but never defined
+     changelog_dispatch_event (xlator_t *, changelog_priv_t *, changelog_event_t *);
+    
+    gf-changelog-journal-handler.c:692:17: warning: 'list_add_tail' is static but
+    used in inline function 'gf_changelog_queue_journal' which is not static
+                     list_add_tail (&entry->list, &jnl_proc->entries);
+    
+    Fix is to remove the keyword from function prototype and
+    definitions.
+    
+    Change-Id: I188b35b7ca087a94d7a48a052b05a6d845e3b74b
+    BUG: 1226853
+    Signed-off-by: Anoop C S <achiraya@redhat.com>
+    Reviewed-on: http://review.gluster.org/11030
+    Tested-by: NetBSD Build System <jenkins@build.gluster.org>
+    Tested-by: Gluster Build System <jenkins@build.gluster.com>
+    Reviewed-by: Venky Shankar <vshankar@redhat.com>
+
+commit cabb28a028b70172c45c72598e1ac43fbed08411
+Author: Aravinda VK <avishwan@redhat.com>
+Date:   Sun May 31 12:18:11 2015 +0530
+
+    spec: move file peer_add_secret_pub to server RPM
+    
+    peer_add_secret_pub was developed as part of geo-replication
+    feature. glusterfind has a dependency on the peer_add_secret_pub
+    for distributing SSH secrets. The dependency was manifest while
+    QA testing glusterfind. peer_add_secret_pub is now moved to the
+    server RPM to support glusterfind without creating a dependency
+    on the geo-replication RPM
+    
+    Change-Id: I1345e13fd6d218eb722cd72ca1b9dd04adf4d316

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