1
0
Fork 0
Commit Graph

437 Commits

Author SHA1 Message Date
Simon Grätzer dfd3cc3869 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
# Conflicts:
#	arangosh/Import/ImportHelper.cpp
2017-03-04 02:08:27 +01:00
jsteemann 573c346fa5 attempt to fix issues reported by @ewoutp 2017-03-03 14:47:21 +01:00
jsteemann 7051f5d87a fixed --convert false in arangoimp 2017-03-02 15:05:06 +01:00
jsteemann 14d5898fc2 test for issue #2342 2017-03-02 13:53:17 +01:00
Simon Grätzer 27c617fe10 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
# Conflicts:
#	3rdParty/V8/v8
#	arangod/Transaction/Methods.h
#	arangod/Utils/UserTransaction.h
#	arangod/V8Server/v8-collection.cpp
2017-03-01 14:52:35 +01:00
baslr d4680cfc0c arangoexport:test fix jslint 2017-02-28 15:54:39 +01:00
baslr a0256af44b arangoexport: added test for xgmml, node module xmldom 2017-02-28 15:25:18 +01:00
jsteemann 82a17fb493 turn off cache tests by default 2017-02-27 09:52:29 +01:00
Dan Larkin 09600f0971 Added hash cache system. 2017-02-24 15:31:40 -05:00
baslr b21ef73aa4 arangoexport: tests use temp directory for output 2017-02-15 12:53:53 +01:00
baslr 4783792684 arangoexport: inital work on test 2017-02-13 12:04:57 +01:00
Simon Grätzer edab268572 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
# Conflicts:
#	arangod/Aql/FunctionDefinitions.cpp
#	arangod/Aql/Functions.h
#	arangod/Utils/ExplicitTransaction.h
2017-02-10 15:21:24 +01:00
Max Neunhoeffer 273c6328c7 Make testing.js more tolerant at shutdown (for high load). 2017-02-09 16:36:58 +01:00
jsteemann f075951be2 refuse to run recovery tests when compiled without enable-failure-tests 2017-02-09 11:52:40 +01:00
Wilfried Goesgens dc9f2d12e8 attempt to obtain a coredump on server shutdown hang 2017-02-07 10:30:58 +01:00
Wilfried Goesgens 540e4178aa attempt to obtain a coredump on server shutdown hang 2017-02-07 10:27:31 +01:00
Wilfried Goesgens 4a5ececba2 fix initialization 2017-02-06 16:33:28 +01:00
jsteemann 86a2f31b2a fix jslint 2017-02-06 16:15:51 +01:00
Wilfried Goesgens 21dd8888f6 add executable suffix 2017-02-06 16:08:10 +01:00
jsteemann 32889266a5 turn off log analysis by default 2017-02-06 12:49:20 +01:00
Simon Grätzer 13f19fe51b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
# Conflicts:
#	arangod/CMakeLists.txt
#	arangod/RestServer/arangod.cpp
#	arangod/Utils/ExplicitTransaction.h
#	arangod/V8Server/v8-collection.cpp
2017-02-02 11:25:23 +01:00
jsteemann e256b11807 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-01 16:44:56 +01:00
jsteemann 0156c5aec7 make database deletion more deterministic 2017-02-01 16:44:41 +01:00
Frank Celler 78a53d1db1 added option configDir 2017-02-01 14:45:17 +01:00
Frank Celler 73cf8e9e04 moved config file for testing to testing 2017-01-31 22:34:03 +01:00
Simon Grätzer 40b3d1511c Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-30 20:39:36 +01:00
Dan Larkin 5b736dc319 Changed index-filling to dispatch batch insertion tasks to scheduler, obsoleted index-threads option. 2017-01-30 13:05:10 -05:00
Kaveh Vahedipour 2db0212e4f supervision tests fail under load 2017-01-30 17:02:27 +01:00
Max Neunhoeffer bf95e308ed Log pid of successfully shutdown server. 2017-01-30 14:21:30 +01:00
Simon Grätzer 64343cd579 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
# Conflicts:
#	scripts/startLocalCluster.sh
2017-01-27 15:58:22 +01:00
Kaveh Vahedipour 3f3633bd2c supervision to proper preconditioning of jobs on plan 2017-01-27 15:29:22 +01:00
Andreas Streichardt a6d0284df5 Properly disable timecritical 2017-01-26 16:01:12 +01:00
Simon Grätzer 4c370a09fe Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
# Conflicts:
#	arangod/Cluster/ClusterInfo.h
2017-01-24 16:41:34 +01:00
Andreas Streichardt 83229cbf79 Add wal flush timeout with a default of 30s 2017-01-24 16:29:41 +01:00
Andreas Streichardt 7b1c9b7833 Instanceinfo and testresult will now be written to the test rootdir 2017-01-24 14:54:10 +01:00
Simon Grätzer 1bd1a52163 Fixed pregel API 2017-01-21 19:00:37 +01:00
Simon Grätzer dd14b7b2dd Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-20 15:56:11 +01:00
Andreas Streichardt 657535eec5 Fix port clash 2017-01-20 15:42:28 +01:00
Kaveh Vahedipour d2760f4ef1 pushing avoidServers property 2017-01-20 15:15:03 +01:00
Kaveh Vahedipour 3ae8428a05 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-20 14:56:53 +01:00
Simon Grätzer d71ebf7c1d Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-20 14:42:19 +01:00
Andreas Streichardt dd7c14a3e9 Add minport and maxport so port clashes are less likely 2017-01-20 10:16:55 +01:00
Kaveh Vahedipour 648160c68a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-20 09:35:45 +01:00
Kaveh Vahedipour 40c6e2b48c unobserve should not create entries in agency, if empty before 2017-01-20 08:06:27 +01:00
Andreas Streichardt 9ad10acdc0 add mochagrep 2017-01-19 17:58:43 +01:00
Max Neunhoeffer 427c8e4553 Merge branch 'devel' into schmutz-ng 2017-01-19 14:53:46 +01:00
Simon Grätzer e7174beaef Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-19 12:38:11 +01:00
Kaveh Vahedipour 3639e2ad5b inquire in agency interface adjusted 2017-01-19 11:33:01 +01:00
Max Neunhoeffer f35e3a7aaf Merge branch 'devel' into schmutz-ng 2017-01-16 09:54:09 +01:00
Simon Grätzer 27dcb11af3 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-13 15:00:59 +01:00