1
0
Fork 0
Commit Graph

37858 Commits

Author SHA1 Message Date
jsteemann f17ff29518 added stubs for indexes 2017-03-23 15:24:00 +01:00
jsteemann 2405ebee25 added diagnostic output 2017-03-23 14:16:26 +01:00
jsteemann 45da5ffe9c more diagnostic output for "not implemented" 2017-03-23 14:10:00 +01:00
jsteemann 0ef305c1be Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-23 13:04:18 +01:00
Max Neunhoeffer 29338899fd Finally port TraverserEngine locking bug fix manually. 2017-03-23 12:44:51 +01:00
jsteemann 4086c65e45 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-23 12:36:58 +01:00
jsteemann 90d81af098 fix compile error 2017-03-23 12:33:47 +01:00
Max Neunhoeffer b07f302ce5 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2017-03-23 12:33:31 +01:00
Max Neunhoeffer 32953a4a97 Revert "Fix locking of shards in TraverserEngines."
This reverts commit 467088b8af.
2017-03-23 12:33:11 +01:00
jsteemann e5543f5ea2 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-23 12:25:50 +01:00
jsteemann 5d82e260ff added test for issue #2392 2017-03-23 12:25:42 +01:00
Max Neunhoeffer 467088b8af Fix locking of shards in TraverserEngines. 2017-03-23 12:23:40 +01:00
jsteemann e37ac1c4f8 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-23 12:18:36 +01:00
jsteemann ed40426f09 increase default timeout from 30 to 900 seconds 2017-03-23 12:18:24 +01:00
Max Neunhoeffer 66a8ea1538 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2017-03-23 12:15:40 +01:00
jsteemann accae9b5f3 updated CHANGELOG 2017-03-23 12:10:47 +01:00
jsteemann 6bb9863108 fixed issue #2392 2017-03-23 12:10:11 +01:00
Max Neunhoeffer 64a18f78e0 Fix SortedCollectBlock skipping issue. Resolves #1482. 2017-03-23 12:08:54 +01:00
jsteemann 55c38befbf enum databases, views and collections at startup 2017-03-23 11:52:22 +01:00
Max Neunhoeffer 09cc428e00 Increase standard intra cluster timeout from 90 to 120s. 2017-03-23 10:09:12 +01:00
jsteemann 806c33eb1c cleanup 2017-03-23 09:01:21 +01:00
jsteemann 564598cb51 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-23 08:40:15 +01:00
Dan Larkin 73a83e032f Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-03-22 15:27:01 -04:00
Dan Larkin 22d17a318b Fixed a failing cache test. 2017-03-22 15:26:54 -04:00
hkernbach cebc1eb888 grunt build 2017-03-22 19:35:36 +01:00
Jan Christoph Uhde 59eafed99d Add code that checks during startup if _system database exists 2017-03-22 18:28:35 +01:00
jsteemann d2f9289ed0 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-22 18:13:28 +01:00
jsteemann f8a25febe7 fix tests with g++5.4.1 and ASAN 2017-03-22 18:13:19 +01:00
Jan Christoph Uhde 1cb1d37d01 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-22 17:59:10 +01:00
Jan Christoph Uhde 7c7268b269 Try to load existing databases 2017-03-22 17:58:38 +01:00
Simon Grätzer bac7081983 Pregel: Reduced logspam 2017-03-22 17:55:43 +01:00
Wilfried Goesgens 98f812cdbe Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-03-22 17:29:52 +01:00
Wilfried Goesgens 29bc9e79ba hook the client package copy target into the global copy target 2017-03-22 17:29:42 +01:00
jsteemann ca19946c63 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-22 16:57:44 +01:00
hkernbach b7d165eed3 ui - fixed submenu issue 2017-03-22 15:41:23 +01:00
Wilfried Goesgens a7e69ca0ee new example 2017-03-22 15:38:56 +01:00
Wilfried Goesgens d41a5cfb3f add the new engine api 2017-03-22 15:38:23 +01:00
jsteemann bd3005b6d3 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-22 14:55:53 +01:00
jsteemann 2824472ddc removed obsolete APIs 2017-03-22 14:54:16 +01:00
Jan Christoph Uhde ea405c8ddb resolve conflicts after merge 2017-03-22 14:50:50 +01:00
jsteemann a94acc5504 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-22 14:48:34 +01:00
jsteemann 324e89957f Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-22 14:48:29 +01:00
Jan Christoph Uhde 85e438ee00 Merge remote-tracking branch 'origin/devel' into engine-api 2017-03-22 14:47:42 +01:00
jsteemann 1b395d7af4 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-22 14:46:19 +01:00
jsteemann e270ddb262 fixed failing test 2017-03-22 14:46:10 +01:00
Jan Christoph Uhde 0deac5fe62 Add functon to create slices from RocksDBEntryTypes 2017-03-22 14:45:54 +01:00
hkernbach 1b3c2e59b2 fixed mem leak issue: #2352 2017-03-22 14:36:25 +01:00
jsteemann f341d416da Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-22 14:21:43 +01:00
jsteemann 3db380dc6d do not throw in destructor 2017-03-22 14:20:01 +01:00
jsteemann d9d9eaac60 fixed two cluster tests 2017-03-22 14:03:27 +01:00