From fca903372c5faaa05707dd01105d0b818c578c80 Mon Sep 17 00:00:00 2001
From: Max Neunhoeffer <max@arangodb.com>
Date: Thu, 18 Jun 2015 18:04:33 +0200
Subject: [PATCH] Add cluster bugfix to CHANGELOG.

---
 CHANGELOG | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 67023fe93f..d28be6e3d1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -708,6 +708,9 @@ v2.6.0-beta4 (2015-06-16)
   This is controlled by the `indexBuckets` attribute in the `properties`
   of the collection.
 
+* fix a cluster deadlock bug in larger clusters by marking a thread waiting
+  for a lock on a DBserver as blocked
+
 
 v2.5.4 (2015-05-14)
 -------------------