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

36535 Commits

Author SHA1 Message Date
jsteemann 680a659184 fix another merge conflict 2017-02-10 09:38:42 +01:00
jsteemann 23ed96b7a7 fix compile error after merge 2017-02-10 09:36:49 +01:00
hkernbach adf523c943 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-02-10 09:36:47 +01:00
jsteemann 0850e8293a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-10 09:34:55 +01:00
jsteemann d024a6d00a remove logging for non-topics 2017-02-10 09:32:50 +01:00
Max Neunhoeffer fd3f3a88e7 Destroy all traverser engines when AQL is shut down. 2017-02-10 09:12:15 +01:00
hkernbach 049496ecd9 css 2017-02-10 08:53:28 +01:00
Max Neunhoeffer cf2a47e52c Increase timeout for testServerEmpty. 
Under heavy load 5 min might not be enough.
 2017-02-09 22:14:53 +01:00
Max Neunhoeffer f72af6a06a Increase timeout for waiting for sync repl to settle. 
This is mainly for the case of the parallel unittests, where the heavy
load leads to delays.
 2017-02-09 22:06:39 +01:00
Jan Christoph Uhde 714dd3ee3a rebase database-management 2017-02-09 18:47:20 +01:00
jsteemann b6218159c3 remove static_assert (thanks MSVC) 2017-02-09 17:42:38 +01:00
jsteemann 76aa4f3ca2 less log spam 2017-02-09 17:42:10 +01:00
jsteemann 302464726d properly initialize members 2017-02-09 17:41:22 +01:00
Max Neunhoeffer f5a22b18b3 Kill queries in registry at shutdown. 2017-02-09 16:54:13 +01:00
Max Neunhoeffer 273c6328c7 Make testing.js more tolerant at shutdown (for high load). 2017-02-09 16:36:58 +01:00
Max Neunhoeffer 6be0c909b6 Merge remote-tracking branch 'origin/devel' into maxtests 2017-02-09 14:39:51 +01:00
hkernbach eeb14ab05e Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-02-09 14:01:20 +01:00
hkernbach a635b0ee59 fixed bug in query ui 2017-02-09 14:00:51 +01:00
Max Neunhoeffer 226fd54db2 Fix shutdown bug around ClusterComm and ClusterCommThread. 2017-02-09 12:37:49 +01:00
jsteemann d23084754c remove unused variable 2017-02-09 12:31:58 +01:00
jsteemann a896661714 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-09 12:10:32 +01:00
jsteemann 4da72d7aa9 added code for TLS tracing 2017-02-09 12:10:19 +01:00
Max Neunhoeffer ffd617103f Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2017-02-09 11:58:47 +01:00
Max Neunhoeffer 7f291fe369 Reactivate TRI_ASSERT(false) if ClusterComm is used after destruction. 2017-02-09 11:58:25 +01:00
Max Neunhoeffer 298b9ffc3b Add AQLFeature. 2017-02-09 11:57:51 +01:00
jsteemann de75b9ec91 better help for options 2017-02-09 11:56:31 +01:00
Max Neunhoeffer 141927e084 Implement timeout in TraverserEngineRegistry. 2017-02-09 11:54:38 +01:00
jsteemann 15f371e5d1 fix typo 2017-02-09 11:54:07 +01:00
jsteemann f075951be2 refuse to run recovery tests when compiled without enable-failure-tests 2017-02-09 11:52:40 +01:00
Max Neunhoeffer d137504b03 Move initialization to prepare in StatisticsFeature. 2017-02-09 11:52:19 +01:00
Michael Hackstein 1543d1cf63 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-09 10:35:47 +01:00
Michael Hackstein fd7341bbfa Moved a generic Aql Edge Condition builder out of the TraversalNode. It shall be used for all edge queries on other places. 2017-02-09 10:35:41 +01:00
Michael Hackstein 7de0142fc1 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-02-08 17:34:34 +01:00
Andreas Streichardt f699e4f7d9 Allow deleting coordinators 2017-02-08 17:33:07 +01:00
Wilfried Goesgens d8cd84872f fix windows compile 2017-02-08 17:21:31 +01:00
Michael Hackstein a3c916902a Merge branch 'engine-api' of github.com:arangodb/arangodb into devel 2017-02-08 16:43:15 +01:00
Andreas Streichardt 4a2bb9716a Do not start up if replication failed 2017-02-08 16:18:41 +01:00
Michael Hackstein bb7d1bb1ab Updated StorageEngine Todolist 2017-02-08 16:15:46 +01:00
Kaveh Vahedipour 64ebfaa628 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-08 16:01:33 +01:00
Kaveh Vahedipour e9651ae65c compaction thread tested and functional 2017-02-08 16:01:15 +01:00
Michael Hackstein 5dfd652d64 Merge branch 'devel' of github.com:arangodb/arangodb into engine-api 2017-02-08 15:57:30 +01:00
Michael Hackstein 56aecc948d Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-08 15:46:15 +01:00
Michael Hackstein dfc9f29e69 Moved FunctionDefinitions to an AqlFunctionFeature. This now has a defined startup ordering 2017-02-08 15:45:59 +01:00
Wilfried Goesgens 562bce64d0 SILENCE! 2017-02-08 15:39:07 +01:00
Wilfried Goesgens ae59abf5ea remove superfluous installs of icu 2017-02-08 15:36:38 +01:00
Wilfried Goesgens a3ac94d3b2 fix locating of relative ICU files 2017-02-08 15:18:16 +01:00
Andreas Streichardt f1da0c54f6 jslint 2017-02-08 15:07:47 +01:00
Andreas Streichardt edd27e7eff more remove checks 2017-02-08 15:07:47 +01:00
jsteemann 4fa4259c59 hide some infrequently used config options by default 2017-02-08 14:43:59 +01:00
Kaveh Vahedipour 3ee7a8d595 compaction thread tested and functional 2017-02-08 14:18:46 +01:00