From d4f2f920bc99cfc35e1cc231876e55bcde1c7a7d Mon Sep 17 00:00:00 2001
From: Willi Goesgens <willi@arangodb.com>
Date: Thu, 18 Jun 2015 17:45:19 +0200
Subject: [PATCH 1/2] use proper build flags so our V8 is built using c++11; as
 in 721730ebf8c3a342f62c8861a1f36ae5d1301e10

---
 3rdParty/V8-4.3.61/build/standalone.gypi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/3rdParty/V8-4.3.61/build/standalone.gypi b/3rdParty/V8-4.3.61/build/standalone.gypi
index 205f924b24..62951b15e7 100644
--- a/3rdParty/V8-4.3.61/build/standalone.gypi
+++ b/3rdParty/V8-4.3.61/build/standalone.gypi
@@ -338,7 +338,7 @@
           # Don't warn about the "struct foo f = {0};" initialization pattern.
           '-Wno-missing-field-initializers',
         ],
-        'cflags_cc': [ '-Wnon-virtual-dtor', '-fno-rtti', '-std=gnu++0x' ],
+        'cflags_cc': [ '-Wnon-virtual-dtor', '-fno-rtti', '-std=gnu++11' ],
         'ldflags': [ '-pthread', ],
         'conditions': [
           [ 'host_arch=="ppc64" and OS!="aix"', {
@@ -365,7 +365,7 @@
           # Don't warn about the "struct foo f = {0};" initialization pattern.
           '-Wno-missing-field-initializers',
         ],
-        'cflags_cc': [ '-Wnon-virtual-dtor', '-fno-rtti', '-std=gnu++0x' ],
+        'cflags_cc': [ '-Wnon-virtual-dtor', '-fno-rtti', '-std=gnu++11' ],
         'conditions': [
           [ 'visibility=="hidden"', {
             'cflags': [ '-fvisibility=hidden' ],
@@ -516,7 +516,7 @@
           ['clang==1', {
             'xcode_settings': {
               'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0',
-              'CLANG_CXX_LANGUAGE_STANDARD': 'gnu++0x',  # -std=gnu++0x
+              'CLANG_CXX_LANGUAGE_STANDARD': 'gnu++11',  # -std=gnu++11
             },
           }],
         ],

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 2/2] 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)
 -------------------