Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

This commit is contained in:
Jan Steemann 2015-06-18 18:31:13 +02:00
parent 58a8f2a6a2 806587c371
commit 76a5d947dc
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
3rdParty/V8-4.3.61/build/standalone.gypi vendored
View File

@ -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
},
}],
],

3
CHANGELOG
View File

@ -714,6 +714,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)
-------------------