Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
40,546 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

15092 Commits

Author SHA1 Message Date
Andreas Streichardt 2252088572 Squashed commit of the following: 
commit f3d0fd6584b0e451b8c97abcb4ba8d9f2fc6f560
Author: Andreas Streichardt <andreas@arangodb.com>
Date:   Thu Jun 1 17:31:36 2017 +0200

    fix unittest

commit 7cd3544a39e1b78af9d4175cb3b978799b9bbfff
Author: Andreas Streichardt <andreas@arangodb.com>
Date:   Thu Jun 1 17:10:00 2017 +0200

    Remove debug comment

commit fb6b10dac15be49a72dbff80030a7d22abdfc3e0
Merge: 055eb1d269 6b18cc64fe
Author: Andreas Streichardt <andreas@arangodb.com>
Date:   Thu Jun 1 17:00:21 2017 +0200

    Merge branch 'devel' into shardorganizer

commit 055eb1d2693a583d21ea59ec8b6ba95ab0db57ac
Merge: 1ff7998ebf 8ea89b7677
Author: Mop <andreas@arangodb.com>
Date:   Thu Jun 1 16:56:30 2017 +0200

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

commit 8ea89b76777c75b6a77bf695c3f074a0c4643c29
Author: Andreas Streichardt <andreas@arangodb.com>
Date:   Thu Jun 1 16:55:41 2017 +0200

    Fix shardmapping bug

commit 1ff7998ebfd691598ec5b455ca5bc2bfd7020fb4
Author: Mop <andreas@arangodb.com>
Date:   Wed May 31 17:26:08 2017 +0200

    more output

commit 68e88aa0e14316c4929d05b2c151bee6421d754d
Merge: 0978ad1d9e 44a6a78ec3
Author: Mop <andreas@arangodb.com>
Date:   Wed May 31 17:03:33 2017 +0200

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

commit 44a6a78ec338a1e7cabb15464500d96b84c68f1d
Author: Andreas Streichardt <andreas@arangodb.com>
Date:   Wed May 31 07:42:43 2017 -0700

    Fix namespace

commit 0978ad1d9e2f01b86204990e74b66958f25eba66
Merge: f98582ccff d74e5989ad
Author: Mop <andreas@arangodb.com>
Date:   Wed May 31 16:40:35 2017 +0200

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

commit f98582ccff3448f6c2388dab4cc2dc38034271b0
Author: Mop <andreas@arangodb.com>
Date:   Wed May 31 16:39:03 2017 +0200

    Revert "Revert "Next attempt at merging ShardOrganizer...distributeShardsLike fixed""

    This reverts commit fed45b7b10.

commit d74e5989ad478efe7d66d196715c05f4f41c9c29
Author: Andreas Streichardt <andreas@arangodb.com>
Date:   Wed May 31 16:31:31 2017 +0200

    Make it an error

commit 0a6a9ef9464df4f24ad205bbab5b9f8ded50054f
Author: Andreas Streichardt <andreas@arangodb.com>
Date:   Wed May 31 12:42:51 2017 +0200

    distributeShardsLike has to be saved as a cidString
 2017-06-01 17:32:40 +02:00
jsteemann 377431b138 abort waitForSync ops during server shutdown 2017-06-01 17:07:09 +02:00
Simon Grätzer 7b2306446d Merge branch 'devel' of https://github.com/arangodb/arangodb into feature/edge-index-hacks 2017-06-01 16:09:36 +02:00
Simon Grätzer 3e8c16d1a7 Adding edge key into edge index 2017-06-01 16:07:39 +02:00
jsteemann d13144f389 fixed issue #2515 2017-06-01 13:45:47 +02:00
Michael Hackstein 65192862c2 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-06-01 13:34:22 +02:00
Michael Hackstein 625a3ac2f4 The single server edge cursor is now more resiliont to 0 document tokens (returned by primary only) 2017-06-01 13:34:10 +02:00
jsteemann 567e4bc21e fix typo 2017-06-01 13:05:35 +02:00
jsteemann b86478ca20 fixed struct/class confusion 2017-06-01 12:06:14 +02:00
Michael Hackstein 655aaf415e Fixed an undefined behaviour bug in shortest-path implementation introduced with the latest reordering 2017-06-01 11:05:26 +02:00
jsteemann a68c95d2b7 try to honor server shutdown while locks are held 2017-06-01 02:24:00 +02:00
jsteemann b91eab0ce8 honor transaction options 2017-06-01 02:01:33 +02:00
jsteemann b285112105 fix linker errors 2017-06-01 01:24:29 +02:00
Simon Grätzer f4d435d140 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-31 18:27:02 +02:00
Alan Plum 826d42f8c7 Remove coord list hack (#2484) 2017-05-31 18:22:23 +02:00
Simon Grätzer 2ccea54404 Merge branch 'devel' of https://github.com/arangodb/arangodb into feature/alliterator 2017-05-31 18:13:00 +02:00
Simon Grätzer 66f10870dd Renaming files 2017-05-31 18:12:47 +02:00
Simon Grätzer 72661d85c3 fixed incremental replication 2017-05-31 18:08:05 +02:00
jsteemann e6d54bee9e cppcheck 2017-05-31 18:07:25 +02:00
Michael Hackstein 52406567cd Replaced EdgeCursors callback to return cid,rev instead of _id. Does less costly copying and comparision internally 2017-05-31 17:49:46 +02:00
Simon Grätzer 36d440767b Merge branch 'devel' of https://github.com/arangodb/arangodb into feature/alliterator 2017-05-31 16:38:55 +02:00
Simon Grätzer 469e57773e workaround for replication 2017-05-31 16:37:58 +02:00
jsteemann d24455c682 pass transaction options into AQL queries 2017-05-31 16:23:04 +02:00
jsteemann 8b74913c56 remove debug message 2017-05-31 15:27:35 +02:00
Simon Grätzer 87ee7a45fe Adding error checks 2017-05-31 15:10:17 +02:00
jsteemann 0b01db7531 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-31 15:04:45 +02:00
Mop fed45b7b10 Revert "Next attempt at merging ShardOrganizer...distributeShardsLike fixed" 
This reverts commit 16329a3b01.
 2017-05-31 14:46:22 +02:00
Simon Grätzer 58c8da1acf fixing replication 2017-05-31 14:39:40 +02:00
jsteemann 2457d66c92 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-31 14:16:14 +02:00
jsteemann eec81e730b fixed MSVC warning 2017-05-31 14:16:04 +02:00
Andreas Streichardt 6811a22c5c Fix clusterSendToAll 2017-05-31 13:53:37 +02:00
Simon Grätzer 402565af75 Merge branch 'feature/alliterator' of https://github.com/arangodb/arangodb into devel 2017-05-31 13:51:00 +02:00
Wilfried Goesgens 613ad8bd9c when running as service correctly set the error state on abort / failure cases, so other components can evaluate it. 2017-05-31 13:21:50 +02:00
Andreas Streichardt 16329a3b01 Next attempt at merging ShardOrganizer...distributeShardsLike fixed 2017-05-31 13:01:30 +02:00
Simon Grätzer ddc032ec14 removing readahead size 2017-05-31 12:26:51 +02:00
Simon Grätzer 879829e881 Merge branches 'devel' and 'feature/alliterator' of https://github.com/arangodb/arangodb into feature/alliterator 2017-05-31 11:42:20 +02:00
Simon Grätzer 53ece582a8 optimized all index iterator 2017-05-31 11:34:32 +02:00
jsteemann 5433c000fc Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-31 11:27:38 +02:00
jsteemann ad811dcd15 fix comment 2017-05-31 11:27:33 +02:00
Jan Christoph Uhde e0f608f219 check endianess when storing ints 2017-05-31 10:52:32 +02:00
Frank Celler f45325fe3f comment out new options. Needs further investigation into performance impact 2017-05-31 09:15:45 +02:00
Frank Celler 73a4203413 Revert "Implement shardorganizer...Cluster with 1 DBServer possible again" 
This reverts commit 1b2d6dca83.
 2017-05-30 23:40:01 +02:00
jsteemann bc2f86969b remove unused variable 2017-05-30 23:18:37 +02:00
Andreas Streichardt dded5abb6c Merge remote-tracking branch 'origin' into shardorganizer 2017-05-30 20:17:07 +02:00
Andreas Streichardt 1b2d6dca83 Implement shardorganizer...Cluster with 1 DBServer possible again 2017-05-30 20:13:00 +02:00
Dan Larkin e43d1a4f8d Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-05-30 13:04:38 -04:00
Dan Larkin a4aa1eedd2 Updated plain cache to properly count evictions. 2017-05-30 13:04:30 -04:00
jsteemann 2961f33a4b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-30 16:39:48 +02:00
jsteemann 3dab019067 sync ENGINE file 2017-05-30 16:39:30 +02:00
Simon Grätzer 5509776503 Fixing various issues 2017-05-30 13:44:26 +02:00
Simon Grätzer 6ecf733585 Merge branch 'devel' of https://github.com/arangodb/arangodb into feature/storage-format-refactoring 
# Conflicts:
#	tests/RocksDBEngine/TypeConversionTest.cpp
 2017-05-30 13:42:44 +02:00
jsteemann 3886aece76 updated manual 2017-05-30 13:09:06 +02:00
Simon Grätzer d0eafe420a fixed vertexId getter 2017-05-30 12:46:18 +02:00
jsteemann f824f9b568 fixed failing tests 2017-05-30 12:43:20 +02:00
jsteemann 63d035761e Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-30 12:04:30 +02:00
jsteemann 53b150b206 added tests for intermediate commits 2017-05-30 12:03:58 +02:00
Simon Grätzer 09e0545cbd Merge branch 'devel' of https://github.com/arangodb/arangodb into feature/storage-format-refactoring 2017-05-30 11:31:15 +02:00
Simon Grätzer ab292b2717 Fixing edge bounds 2017-05-30 11:30:48 +02:00
Jan Christoph Uhde 64c0b03a99 Add missing changes to geo index 2017-05-30 11:08:44 +02:00
Simon Grätzer 12d1b2d318 Merge branch 'devel' of https://github.com/arangodb/arangodb into feature/storage-format-refactoring 2017-05-30 10:12:47 +02:00
Simon Grätzer 3ad939ea41 changed storage format 2017-05-30 10:12:39 +02:00
Jan Christoph Uhde c4e7ae54da Prepare geodata to be more platform independent 2017-05-30 09:22:45 +02:00
jsteemann ed21022f55 added test for shardids restriction 2017-05-29 17:02:16 +02:00
Simon Grätzer f20a0a8c3d Merge branch 'devel' of https://github.com/arangodb/arangodb into feature/storage-format-refactoring 2017-05-29 16:01:06 +02:00
Simon Grätzer f8ab86e160 Begin storage format refactoring 2017-05-29 16:00:55 +02:00
jsteemann a35f85bcc7 added proper docs for --query.fail-on-warning 2017-05-29 15:46:48 +02:00
jsteemann c7e1877fd6 workaround for compile issue 2017-05-29 13:02:22 +02:00
Frank Celler 4b61f5b8bb added --rocksdb.num-uncompressed-levels 2017-05-29 11:56:48 +02:00
jsteemann 76f2ce5b2c nicer error message on startup when RocksDB data version does not fit 2017-05-29 11:36:05 +02:00
jsteemann d2704cab51 issue #2505 2017-05-29 10:29:47 +02:00
jsteemann caad48df33 issue #2505 2017-05-29 10:19:45 +02:00
Michael Hackstein b9d2faa7cc Added warmup function for indexes. 
Squashed commit of the following:

commit bc0472d212b2efef0d7b1b8a36f2b43e8432ba86
Merge: eb47631 5f87674
Author: Michael Hackstein <michael@arangodb.com>
Date:   Mon May 29 09:39:31 2017 +0200

    Merge branch 'devel' of github.com:arangodb/arangodb into feature/rocks-index-warmup

commit eb476310b0ca6165be10b37b960933886c2757f5
Merge: d725f21 32149d2
Author: Michael Hackstein <michael@arangodb.com>
Date:   Mon May 29 09:00:41 2017 +0200

    Merge branch 'devel' of github.com:arangodb/arangodb into feature/rocks-index-warmup

commit d725f21f7d61f7c79ba31fc0338881e35f4d8f48
Author: Michael Hackstein <michael@arangodb.com>
Date:   Fri May 26 15:53:23 2017 +0200

    Activated collection warmup in Cluster Mode. Added a test for collection warmup (SingleServerOnly)

commit 132bf4f9565b0dcf4ec9f84e93897b482a67ce7f
Author: Michael Hackstein <michael@arangodb.com>
Date:   Fri May 26 12:46:20 2017 +0200

    Implemented client-side warmup. It can now be triggered via http and arangosh

commit 78ea449dff86118814a2f87bdb59dc16544d92b6
Author: Michael Hackstein <michael@arangodb.com>
Date:   Fri May 26 11:25:40 2017 +0200

    Fixed assertion.

commit dae80f6277dde1a52eadda506858cc36e235bd55
Author: Michael Hackstein <michael@arangodb.com>
Date:   Fri May 26 11:08:46 2017 +0200

    Improved the CuckooIndexEstimator computeEstimate function. It is now much better on collections with many different values

commit 7abf57876511ba369d7a577e1995d4575e98c7c8
Author: Michael Hackstein <michael@arangodb.com>
Date:   Fri May 26 11:06:43 2017 +0200

    Edge index warmup will now first check if a document is stored and if not will insert it. Furthermore it resizes the cache with an estimate of how many documents will be most likely inserted

commit 890d8ad4cdfd155249f060fedd5c798b9531d556
Author: Michael Hackstein <michael@arangodb.com>
Date:   Fri May 26 11:04:47 2017 +0200

    Adjusted thresholds in transactional cache. Wastly increased the amount of tries to get the lock. Lowered the fill-grade boundaries

commit 60972ab7151a3acb78e1aae4149de11d0da7aceb
Author: Michael Hackstein <michael@arangodb.com>
Date:   Fri May 26 10:45:38 2017 +0200

    Added new Logtpopic CACHE that should be used to log important information regarding caches, like debug ouput on evictions / resizing, or memory-pressure resizing going on

commit 2dfacb9aef6e3fde169032514baca386786d059c
Author: Michael Hackstein <michael@arangodb.com>
Date:   Fri May 26 10:44:21 2017 +0200

    Fixed an assertion in index iterator. It expected _from/_to to be cached but we modified to cache entire document

commit f05beccef65853c30eda1859a39c28ea2295bc71
Merge: 13c6abf 5c46430
Author: Michael Hackstein <michael@arangodb.com>
Date:   Fri May 26 07:56:58 2017 +0200

    Merge branch 'devel' of github.com:arangodb/arangodb into feature/rocks-index-warmup

commit 13c6abfbc2ddb451a689011110411df68247435e
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed May 24 09:52:01 2017 +0200

    Added a getExtra feature for the edgeIndex. It now returns the complete edge as extra (temporary). Modified the EdgeCache to cache token and edge document (temporary). Added a warmup Function to collections that is used to warmup the index caches on demand.
 2017-05-29 09:40:58 +02:00
Dan Larkin 5f87674b6f Made LoggerView log to VIEWS topic and fixed level bug. 2017-05-28 18:24:51 -04:00
Frank Celler ee1c60c67a added _binaryDocument and _binaryInsert (#2506) 2017-05-27 22:49:22 +02:00
Frank Celler b7961ef3dd Reenabled snappy (#2504) 
* fixed snappy config

* added numactl and GLIBCXX_FORCE_NEW

* enabled snappy

* fix snappy include path

* windows paths
 2017-05-26 20:53:23 +02:00
Simon Grätzer 32149d2738 applied clang format 2017-05-26 14:50:01 +02:00
Simon Grätzer 21dd147ad6 Fixing issues 2017-05-26 14:03:12 +02:00
Simon Grätzer 92c7bf8dd6 fixing wrong counter manager 2017-05-26 13:35:31 +02:00
Simon Grätzer d5f85d5bbb Adding more colum families 2017-05-26 10:43:17 +02:00
Simon Grätzer 5367e34935 Merge branch 'devel' of https://github.com/arangodb/arangodb into column-family 2017-05-26 08:24:33 +02:00
Frank Celler 6bdc91c1b1 Merge pull request #2496 from joerg84/devel 
Fixed incorrect config option in error message.
 2017-05-25 10:13:24 +02:00
Joerg Schad b41793e5b0 Fixed incorrect config option in error message. 2017-05-25 14:08:02 +09:00
Max Neunhoeffer 85385486ab Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2017-05-24 23:34:20 +02:00
Max Neunhoeffer ad5652ad1d Make two obsolete options hidden. 2017-05-24 23:33:55 +02:00
jsteemann b9c4efbaf8 added environmentfeature 2017-05-24 22:00:16 +02:00
Dan Larkin afceeb1b14 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-05-24 13:46:05 -04:00
Dan Larkin 5ec026b659 Added sizeHint method for caches to improve warmup procedures. 2017-05-24 13:45:53 -04:00
jsteemann e49cdceaa1 added missing lock 2017-05-24 19:41:43 +02:00
Simon Grätzer 555a7fcecd Merge branch 'devel' of https://github.com/arangodb/arangodb into column-family 2017-05-24 19:04:20 +02:00
Simon Grätzer 36503af230 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangod/RocksDBEngine/RocksDBReplicationTailing.cpp
 2017-05-24 18:38:34 +02:00
Simon Grätzer 2f2d07ab9a Multihreaded import 2017-05-24 18:37:45 +02:00
Andreas Streichardt b70644440b Do not allow creation of user collection when there are not enough 
servers
 2017-05-24 18:04:35 +02:00
jsteemann 1e0bfe78cb fix assertion 2017-05-24 16:57:21 +02:00
jsteemann 73726f9ce6 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-24 16:49:53 +02:00
jsteemann 69c7f962b0 reset state variable 2017-05-24 16:49:44 +02:00
Dan Larkin 0b8546ca98 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-05-24 10:44:38 -04:00
Dan Larkin e935c83762 Exposed isMigrating() method on caches. 2017-05-24 10:44:34 -04:00
Andreas Streichardt 50876d0d3f Do not look at replicationFactor while creating...just look at the plan! it is great! 2017-05-24 16:25:49 +02:00
Andreas Streichardt b5fcd15214 Fix linter 2017-05-24 14:53:06 +02:00
Andreas Streichardt ab2dcfb844 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-05-24 14:33:22 +02:00
Andreas Streichardt f2670f8040 Extract compareServerList and make it reuseable 2017-05-24 14:13:51 +02:00
jsteemann 4ee75af662 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-24 11:59:49 +02:00
Max Neunhoeffer d45ac5536d Adjust lower limit for timeout in sync repl for RocksDB. 2017-05-24 11:52:39 +02:00
Max Neunhoeffer 9ce9db63fc Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2017-05-24 11:50:27 +02:00
jsteemann d6bb581b18 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-24 11:33:53 +02:00
jsteemann 81786c0aa6 print compression support 2017-05-24 11:33:46 +02:00
jsteemann 631453a1f3 more options 2017-05-24 11:15:36 +02:00
jsteemann b23285df81 added more options, but not effective yet 2017-05-24 11:02:24 +02:00
Max Neunhoeffer ff12815b2e Correct a typo in a variable name, improve comments. 2017-05-24 09:53:40 +02:00
Max Neunhoeffer 77517709ea Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2017-05-24 08:58:43 +02:00
Dan Larkin 71846d0ad7 Added hinting so cache table is aware of eviction rate problems. 2017-05-23 19:05:50 -04:00
Dan Larkin 78c80c3a3d Doubled size of cache buckets to increase associativity. 2017-05-23 17:51:47 -04:00
Max Neunhoeffer 11e6b9ea7f Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2017-05-23 20:38:38 +02:00
jsteemann c722a5f4d7 move 2017-05-23 18:02:17 +02:00
jsteemann 27a8adf9b8 moved shell colors into their own feature 2017-05-23 16:53:43 +02:00
Dan Larkin fa2441cc96 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-05-23 10:16:58 -04:00
Dan Larkin 6c9f12ea85 Fixed RocksDB export API. 2017-05-23 10:16:53 -04:00
Michael Hackstein c7ad9ed16d Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-05-23 15:16:02 +02:00
Michael Hackstein 12f1a7c6f6 Fixed a bug where the IndexEstimator could get into undefined behaviour if the persisted estimate contains a size of 0. 2017-05-23 14:25:53 +02:00
jsteemann a4fde59fd2 some refactoring 2017-05-23 13:18:51 +02:00
Michael Hackstein 9055552c8b Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-05-23 13:17:20 +02:00
Michael Hackstein 91e19071a9 The Cuckoo index estimator now uses 32bit counters instead of 16bit. It should be more relyable now. 2017-05-23 12:56:24 +02:00
Simon Grätzer 6c905c8d26 Missed some markers 2017-05-23 11:37:17 +02:00
Simon Grätzer 88977d204a Merge branch 'devel' of https://github.com/arangodb/arangodb into column-family 
# Conflicts:
#	arangod/RocksDBEngine/RocksDBIndex.cpp
#	arangod/RocksDBEngine/RocksDBIndex.h
#	arangod/RocksDBEngine/RocksDBPrimaryIndex.cpp
#	arangod/RocksDBEngine/RocksDBPrimaryIndex.h
 2017-05-23 11:17:30 +02:00
jsteemann ca16705097 windows again 2017-05-23 11:15:17 +02:00
jsteemann 244e380f63 unintentionally broke the export 2017-05-23 10:57:31 +02:00
jsteemann 53fa66e60d move parts from ProgramOptions from headers into cpp files 2017-05-23 10:30:36 +02:00
jsteemann 2f3e4d0ba0 fix init order 2017-05-23 08:57:39 +02:00
jsteemann ad5e58b050 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-23 08:53:26 +02:00
jsteemann a7b3839e6c renamed "getMore" to "next" 2017-05-23 08:53:13 +02:00
Simon Grätzer ddfa15b8cc Adding bound checking back 2017-05-22 19:09:32 +02:00
Simon Grätzer 6db35a93a0 Merge 2017-05-22 18:05:15 +02:00
jsteemann 802180e2f2 better error messages 2017-05-22 18:00:20 +02:00
jsteemann 79cda92a2a move common code into its own file 2017-05-22 17:46:12 +02:00
Simon Grätzer 9679aecf53 Adding bounds back 2017-05-22 17:39:19 +02:00
jsteemann 221583e9ca fix warning 2017-05-22 16:00:05 +02:00
jsteemann ee0ba4f377 inline functions 2017-05-22 15:58:27 +02:00
jsteemann c53126cebc added missing include 2017-05-22 15:58:07 +02:00
jsteemann 183ae6381d add missing include 2017-05-22 15:57:54 +02:00
jsteemann e74f77fbc9 fix reserve 2017-05-22 15:57:39 +02:00
jsteemann ae75259542 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-22 15:56:39 +02:00
jsteemann efc4ca24eb remove IsolateData again after context gets destroyed 2017-05-22 15:56:23 +02:00
jsteemann c844db70b8 fixed invalid assertion 2017-05-22 15:54:25 +02:00
Max Neunhoeffer 03c5766a6d Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2017-05-22 15:37:12 +02:00
Max Neunhoeffer 4bddb0c1ad Handle errors in loadScript for JS, use in cluster-bootstrap. 
This recognizes errors that happen during the global cluster bootstrap.
If an error happens, the bootstrap is tried again later. The cluster
does not start until the cluster bootstrap has been finished
successfully.
 2017-05-22 15:34:41 +02:00
Max Neunhoeffer cbdf9563cb Add configuration option to multiply synchronous replication timeout. 2017-05-22 15:34:15 +02:00
jsteemann 686a964718 adjusted error message 2017-05-22 13:53:22 +02:00
jsteemann a91c54f6b3 avoid double-copying of shared ptrs 2017-05-22 11:28:18 +02:00
Simon Grätzer 67b9f75fec Merge branch 'devel' of https://github.com/arangodb/arangodb into column-family 
# Conflicts:
#	arangod/RocksDBEngine/RocksDBEdgeIndex.cpp
 2017-05-22 11:16:26 +02:00
Simon Grätzer ad3da410b2 Pregel improvements 2017-05-22 11:10:28 +02:00