diff --git a/ChangeLog b/ChangeLog
index 3b1c493..1ce32d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1 +1,116985 @@
-ChangeLog is maintained by "git log".
+commit 69b5471d138f3a947b9086ec8fec8fdf6eb44ff6
+Author: vmallika <vmallika@redhat.com>
+Date:   Tue Sep 15 16:15:17 2015 +0530
+
+    marker: validate loc before starting txn
+    
+    Change-Id: Icdda430ae5dbe182ddff119aa4617548c39832e4
+    BUG: 1259578
+    Signed-off-by: vmallika <vmallika@redhat.com>
+    Reviewed-on: http://review.gluster.org/12180
+    Tested-by: Gluster Build System <jenkins@build.gluster.com>
+    Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
+    Reviewed-by: Raghavendra Bhat <raghavendra@redhat.com>
+
+commit 6cbb306c24400b0a6df5cb71f540f1f0190fcc25
+Author: vmallika <vmallika@redhat.com>
+Date:   Wed Jul 29 16:42:20 2015 +0530
+
+    quota/marker: set lk_owner when taking lock on parent in rename
+    
+    This is a backport of http://review.gluster.org/#/c/11561/
+    
+    Before doing a rename operation marker takes inode lock on the file
+    parent,
+    here lk_owner is NULL and this can cause accounting problem with
+    multiple rename on the same directory
+    
+    This patch fix the problem by setting lk_owner
+    
+    > Change-Id: Ibb789e39b2833e425d0a5fca85282ff1465206cb
+    > BUG: 1240598
+    > Signed-off-by: vmallika <vmallika@redhat.com>
+    > Reviewed-on: http://review.gluster.org/11561
+    > Tested-by: Gluster Build System <jenkins@build.gluster.com>
+    > Tested-by: NetBSD Build System <jenkins@build.gluster.org>
+    > Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
+    
+    Change-Id: I54db6c27791862e84eaa958fc9fdc363a22eb2e8
+    BUG: 1247972
+    Signed-off-by: vmallika <vmallika@redhat.com>
+    Reviewed-on: http://review.gluster.org/11795
+    Tested-by: Gluster Build System <jenkins@build.gluster.com>
+    Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
+    Reviewed-by: Raghavendra Bhat <raghavendra@redhat.com>

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