diff --git a/ChangeLog b/ChangeLog
index 3b1c493..a4ad2ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1 +1,99299 @@
-ChangeLog is maintained by "git log".
+commit 191725abf5754e4e883ed945a5560418a9b6b23d
+Author: Niels de Vos <ndevos@redhat.com>
+Date:   Tue Jul 7 18:50:45 2015 +0200
+
+    doc: release notes for GlusterFS 3.5.5
+    
+    BUG: 1208083
+    Change-Id: I3559f6d03c049b55009fcd116c48b99a7434ab6c
+    Signed-off-by: Niels de Vos <ndevos@redhat.com>
+    Reviewed-on: http://review.gluster.org/11568
+    Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
+    Tested-by: Gluster Build System <jenkins@build.gluster.com>
+
+commit 3cf776c49bc60b7f616a4c503a8b10b2d19ad04b
+Author: Niels de Vos <ndevos@redhat.com>
+Date:   Sun Jun 21 15:07:58 2015 +0200
+
+    nfs: make it possible to disable nfs.mount-rmtab
+    
+    When there are many NFS-clients doing very often mount/unmount actions,
+    the updating of the 'rmtab' can become a bottleneck and cause delays. In
+    these situations, the output of 'showmount' may be less important than
+    the responsiveness of the (un)mounting.
+    
+    By setting 'nfs.mount-rmtab' to the value "/-", the cache file is not
+    updated anymore, and the entries are only kept in memory.
+    
+    Cherry picked from commit 40407afb529f6e5fa2f79e9778c2f527122d75eb:
+    > Cherry picked from commit 331ef6e1a86bfc0a93f8a9dec6ad35c417873849:
+    >> BUG: 1169317
+    >> Change-Id: I40c4d8d754932f86fb2b1b2588843390464c773d
+    >> Reported-by: Cyril Peponnet <cyril@peponnet.fr>
+    >> Signed-off-by: Niels de Vos <ndevos@redhat.com>
+    >> Reviewed-on: http://review.gluster.org/9223
+    >> Tested-by: Gluster Build System <jenkins@build.gluster.com>
+    >> Reviewed-by: soumya k <skoduri@redhat.com>
+    >> Reviewed-by: jiffin tony Thottan <jthottan@redhat.com>
+    >> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
+    >
+    > This change also contains the fixes to the test-case from:
+    >>
+    >> nfs: fix spurious failure in bug-1166862.t
+    >>
+    >> In some environments, "showmount" could return an NFS-client that does

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