diff --git a/ChangeLog b/ChangeLog
index 3b1c493..da51d16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1 +1,172356 @@
-ChangeLog is maintained by "git log".
+commit d66a37aa20d8221a93df654166d32cb22acf88ed
+Author: Kaushal M <kaushal@redhat.com>
+Date:   Mon Oct 3 19:32:10 2016 +0530
+
+    doc: Add 3.7.16 release-notes
+    
+    Change-Id: I5b279209cfca77b83b3d2632b19f941f97089ef1
+
+commit 55c92db32ba7d88359f0562953a3a6d8874dd1a5
+Author: Niels de Vos <ndevos@redhat.com>
+Date:   Fri Jun 10 18:23:43 2016 +0530
+
+    gfapi: redesign the public interface for upcall consumers
+    
+    The glfs_callback_arg and glfs_callback_inode_arg were allocated by
+    gfapi, and expected to be free()'d by the application. However it is not
+    reasonable to expect that applications use the same memory allocator to
+    as the compiled libgfapi.so. For instance, it is possible that gfapi
+    uses glibc malloc/free, and an application like NFS-Ganesha the versions
+    from jemalloc. Mismatching of the malloc() and free() functions causes
+    segmentation faults at best.
+    
+    In order to prevent problems like this in the future, the API for
+    applications that consume upcalls has been remodeled. Any of the
+    structures that gfapi allocates, should be free'd with glfs_free(). The
+    members of the structures can not be accessed directly anymore, each
+    has its own function to access now.
+    
+    Correcting the naming of the functions, structures and constants is a
+    continuation of commit 2775dc64101ed37c8d9809bf9852dbf0746ee2b6. These
+    new improvements not only have correct prefixes for the functions and
+    structures, the naming also reflects more to the upcall framework and
+    does not use "callback" anymore.
+    
+    Cherry picked from commit 4721188a154acd9a0a4c096d8d73e97f3bf1b2a9:
+    > Change-Id: I2b8bd5a0a82036d2abea1a217f5e5975a1d4fe93
+    > BUG: 1344714
+    > Signed-off-by: Niels de Vos <ndevos@redhat.com>
+    > Reviewed-on: http://review.gluster.org/14701
+    > Smoke: Gluster Build System <jenkins@build.gluster.org>
+    > NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
+    > CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
+    > Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
+    > Reviewed-by: soumya k <skoduri@redhat.com>

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