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

1466 Commits

Author SHA1 Message Date
Wilfried Goesgens 7507f0d756 one more place to choose the propper directory for unittest result files. 2017-04-06 14:54:09 +02:00
Wilfried Goesgens bf3f68ee26 BUGFIX: when we don't start the server we mustn't try to attempt to clean up its db directories 2017-04-06 11:43:11 +02:00
Wilfried Goesgens 050d931446 Bugfix: we want the common _and_ the server tests. 2017-04-06 11:14:01 +02:00
Andreas Streichardt 61f9f92c46 exclude longrunning tests 2017-04-05 18:47:44 +02:00
jsteemann 56e946bcaf Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-05 12:32:09 +02:00
Andreas Streichardt c4af620144 Revert "Break tests again" 
This reverts commit 111c3fb7cf.
 2017-04-05 12:13:23 +02:00
jsteemann 163c17fc85 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-05 11:23:11 +02:00
Andreas Streichardt 111c3fb7cf Break tests again 2017-04-05 10:48:53 +02:00
jsteemann 745af96786 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-05 10:43:35 +02:00
Andreas Streichardt caaecfda4e Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-04-05 10:21:54 +02:00
Andreas Streichardt b8faee4415 fix replication setup 2017-04-05 10:18:56 +02:00
Wilfried Goesgens d1a6add6ab move replication & js http api tests into more intuitive locations 2017-04-05 09:48:07 +02:00
jsteemann 8d0f13b059 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-05 08:33:32 +02:00
Andreas Streichardt 7400f7f339 fix shutdown of replication tests 2017-04-04 17:09:21 +02:00
Jan Christoph Uhde 3c4bdc106c Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 
* 'devel' of https://github.com/arangodb/arangodb:
  Cluster: expose body as V8 buffer in asyncRequest
  Cluster: expose getFoxxmaster in V8
  make rspec backtrace more compact
 2017-04-04 10:51:07 +02:00
Wilfried Goesgens 57973aa27d make rspec backtrace more compact 2017-04-03 19:37:37 +02:00
jsteemann ad3f1074fe Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-03 17:26:39 +02:00
Wilfried Goesgens a7a70b20cf remove old unused foxxqueues testsuite 2017-04-03 14:55:41 +02:00
jsteemann 0fcfb4f64d Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-03 12:53:06 +02:00
Wilfried Goesgens b117a82382 fix filter for replication testcases 2017-04-03 11:58:52 +02:00
jsteemann 30311ee578 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-31 10:16:26 +02:00
Wilfried Goesgens b509466d39 lower timeout 2017-03-31 10:09:27 +02:00
jsteemann fdd5b3036d Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-31 09:34:06 +02:00
Jan Christoph Uhde 95007fe28e Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api-arango-result 
* 'engine-api' of https://github.com/arangodb/arangodb: (46 commits)
  Merged RocksDBPathBasedIndex into RocksDBVPackIndex.
  fix handling of externals
  fix toArray()
  fix returning documents
  Added hash-, skip list, persistent indexes
  harmonize filtering - filter on full filename.
  mini modifications
  standardize starting of servers for replication tests
  Edge index compliant with design doc
  another fix for #2404
  Moved „removeLargeRange“ method to commons
  Added length byte to IndexValue keys.
  fixed issue #2404
  Added drop to primary index
  Added drop() to indexes
  Fixes a coordinator crash in Clustered Traversal. In case of failover during query planning.
  Fixed edge index
  Expand on CORS documentation
  Let ArangoDB handle the allow-credentials header
  make the authentication tests run on directories
  ...
 2017-03-30 19:46:17 +02:00
Wilfried Goesgens c29fcc9e07 fix testcase filtering - some other filters have to overrule it. 2017-03-30 18:06:31 +02:00
Dan Larkin 5dcf265899 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-03-30 12:05:07 -04:00
Dan Larkin 42807f17fb Added partialUpdate flag for view property modification. 2017-03-30 12:04:58 -04:00
Wilfried Goesgens a2a2d61cbd add bucket support to the rspec tests 2017-03-30 17:58:31 +02:00
Wilfried Goesgens 7d7deb8584 if the server timeoutes during test execution, abort testruns and instantly kill it hard 2017-03-30 17:37:38 +02:00
Wilfried Goesgens e23560a399 harmonize filtering - filter on full filename. 2017-03-30 15:50:25 +02:00
Wilfried Goesgens 3297844f8d standardize starting of servers for replication tests 2017-03-30 15:46:14 +02:00
Jan Christoph Uhde 329af8fa62 print more when using extremeVerbosity 2017-03-30 14:59:46 +02:00
Wilfried Goesgens 302307e285 make the authentication tests run on directories 2017-03-30 13:07:28 +02:00
jsteemann b2c9a976b3 re-enable AQL tests 2017-03-30 09:00:21 +02:00
mpv1989 e763233ca7 Foxx: Fix arangoUser not being set correctly 2017-03-29 17:33:16 +02:00
mpv1989 59e000b743 Foxx: Fix CORS blowing up when headers are not set 2017-03-29 13:43:06 +02:00
jsteemann 02aca574f4 turn off ranges test by default 2017-03-29 11:20:12 +02:00
jsteemann d0766688f3 properly tag geo index tests, and include the long running geo index tests by default 2017-03-29 00:54:24 +02:00
mpv1989 43cb5fc81b Merge branch 'feature/cors' into devel 2017-03-28 20:37:30 +02:00
mpv1989 f3ebf247b0 automatically add CORS response headers 2017-03-28 19:48:46 +02:00
Wilfried Goesgens ffc3d6a515 - move runInArangosh over to test-utils, so its right next to runThere. 
- use runInArangosh for the replication tests, so they show proper result reports.
 2017-03-28 19:05:00 +02:00
Wilfried Goesgens 476befc9d0 refactor testing.js 
- split utility functionality into its own file
 - add module loader so we can have modules
 - move all testsuites into own files
 - remove complicated testcase joining / splitting methods
 2017-03-28 16:29:51 +02:00
mpv1989 4b8c880486 added OPTIONS to cors methods header 2017-03-28 16:18:53 +02:00
Andreas Streichardt f32256e5a7 Normalize test resultstructure (hopefully) 2017-03-28 14:15:08 +02:00
jsteemann a5013733a2 force recovery tests to fail when not compiled with failure-tests 2017-03-28 09:47:52 +02:00
jsteemann a684bd6152 fix recovery tests 2017-03-28 09:34:59 +02:00
Wilfried Goesgens 6940aa6ec1 alias boost to catch 2017-03-27 19:44:06 +02:00
Wilfried Goesgens eb4c2ed8e4 fix arangosh test 2017-03-27 19:42:24 +02:00
Wilfried Goesgens e9a661e470 start splitting testing.js into handy bits. 2017-03-27 19:10:03 +02:00
Wilfried Goesgens f09ee72d65 start splitting testing.js into handy bits. 2017-03-27 19:00:21 +02:00
Wilfried Goesgens 4d0778a825 start splitting testing.js into handy bits. 2017-03-27 18:57:05 +02:00
Wilfried Goesgens 81889bfc54 Work on testingjs to make it fit for storage engine and others: 
- add storage engine switch:
  - filter for files with `-rocksdb` or `-mmfiles` depending on the used storage engine.
- fix missing color reset on error messages
- make --test a substring match instead of a full match.
- print an error message if --test did not match any testcase and thus no tests were run
- disable crash check for the recovery testcases that are actually intended to crash so we can recover from the failed state
- scan for recovery testcases instead of keeping a hand written list
- make test-scan function public
 2017-03-24 16:17:36 +01:00
jsteemann 54a3b1fe5c Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-22 13:27:58 +01:00
jsteemann 82ba9a3538 fixed test expectation 2017-03-22 13:26:58 +01:00
Wilfried Goesgens 7f88bcaf33 make this test work for milestone/alpha/beta/ releases 2017-03-22 13:21:02 +01:00
jsteemann c7b3e002b5 fixed tests 2017-03-22 13:15:21 +01:00
Wilfried Goesgens 85f58b9a21 we may now also do 'milestone'-releases next to devel/alpha/beta/rc 2017-03-22 11:59:25 +01:00
jsteemann fbb14ceffc added db._engine() 2017-03-22 11:19:31 +01:00
Dan Larkin 7b690408c8 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-03-21 12:21:10 -04:00
Wilfried Goesgens 388424bbdc engage debugger when calling general binaries that segfault 2017-03-21 16:49:20 +01:00
Dan Larkin 85132e0eaf Finished adding view support to ArangoShell. 2017-03-21 11:40:14 -04:00
Dan Larkin a80ed16477 Added basic views support to ArangoShell. 2017-03-18 16:35:51 -04:00
jsteemann 2cda79ec0b add some debug output for replication tests 2017-03-17 13:02:15 +01:00
Wilfried Goesgens e4fbbcd0eb migrate wording boost->catch 2017-03-16 17:18:28 +01:00
Wilfried Goesgens 54c62a59a9 try to get stacktraces on mac 2017-03-16 16:04:24 +01:00
Wilfried Goesgens 968ad1f82a try to get stacktraces on mac 2017-03-16 15:01:30 +01:00
Wilfried Goesgens ae50e4ca1c try to get stacktraces on mac 2017-03-16 14:56:55 +01:00
Alan Plum 50e0eb16d2
Use COLOR_OUTPUT to determine whether to use color 2017-03-15 20:44:03 +01:00
Simon Grätzer a326aa2ffb Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-09 14:38:50 +01:00
jsteemann 9278149b24 fixed --convert 2017-03-09 14:29:23 +01:00
Simon Grätzer 67066c64ad Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-08 18:20:44 +01:00
jsteemann 3ed19e291d added "shardIds" option for AQL queries to restrict queries to specific shards 2017-03-08 15:07:10 +01:00
Simon Grätzer 2c77f42486 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-07 15:08:06 +01:00
Andreas Streichardt c5aaa5c633 use junit 2017-03-07 11:59:53 +01:00
Andreas Streichardt 7d51256234 Properly publish results 2017-03-07 11:54:37 +01:00
Andreas Streichardt 4af0eab357 fix icu stuff 2017-03-07 11:21:35 +01:00
Andreas Streichardt 59b49485b5 Merge branch 'devel' into catch_tests_ng 2017-03-06 18:34:46 +01:00
Andreas Streichardt 9c25f5afd8 Adjustments for catch 2017-03-06 18:11:14 +01:00
Andreas Streichardt ce3c17e7de Merge branch 'devel' into catch_tests_ng 2017-03-06 17:59:26 +01:00
Michael Hackstein 048bdf4cbd Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-03-06 13:28:07 +01:00
jsteemann 7640586bd9 added test case for duplicate collections 2017-03-06 13:07:04 +01:00
Michael Hackstein b26ea6c3bd Added a recovery test for duplicate-name creation. This was broken during Engine-API build. 2017-03-06 10:41:21 +01:00
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
Andreas Streichardt 9420fb0e84 scripts unittests fix 2017-03-03 21:15:06 +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
Alan Plum d72f3ea511
Define Foxx's expected routing behaviour 2017-02-14 16:36:40 +01:00
jsteemann 202bfe1963 Merge branch 'suffix-decoding' of https://github.com/arangodb/arangodb into devel 2017-02-14 11:00:24 +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
jsteemann 87d775f41f decode suffixes! 2017-02-08 12:27:45 +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 cec711bc85 Fixed test 2017-01-31 14:13:58 +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
Simon Grätzer 324c874e99 Added test, some refactoring 2017-01-27 15:31:54 +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 370cb09d89 Merge branch 'devel' into schmutz-ng 2017-01-19 10:32:43 +01:00
Simon Grätzer 54da6971f1 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-18 14:07:13 +01:00
Kaveh Vahedipour 15c59285d8 inquire interface and clientids 2017-01-18 11:28:51 +01:00
Kaveh Vahedipour 347e668ceb Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-18 11:07:39 +01:00
Kaveh Vahedipour ea7e16979a agency bug in precondition and log handling fixed 2017-01-18 11:07:30 +01:00
Kaveh Vahedipour 769a44c95a ttl timeouts need to be extended. oh my\! 2017-01-17 23:32:38 +01:00
Simon Grätzer f4e02c58a9 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-17 22:28:07 +01:00
Kaveh Vahedipour 5de455c8dd Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-17 17:33:15 +01:00
Kaveh Vahedipour 54dbf0a814 inquire interface and clientids 2017-01-17 17:33:12 +01:00
Frank Celler d290b74d55 fixed typos 2017-01-17 12:40:17 +01:00
Kaveh Vahedipour 2d21b62007 agency compaction leaves last compaction-keep-size indices behind for reference 2017-01-17 12:15:18 +01:00
Simon Grätzer 1d66c418b6 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangod/CMakeLists.txt
 2017-01-16 17:56:44 +01:00
Andreas Streichardt 7b13a56b91 Merge branch 'devel' into schmutz-ng 2017-01-16 16:15:09 +01:00
Kaveh Vahedipour 879102117d more replicationTest 2017-01-16 15:43:32 +01:00
Andreas Streichardt 10d3bd2200 Merge branch 'devel' into schmutz-ng 2017-01-16 15:22:17 +01:00
Kaveh Vahedipour d7b61f1bde agency tests follow new leader 2017-01-16 14:10:09 +01:00
Simon Grätzer 4821fab2bb Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-16 13:59:07 +01:00
Kaveh Vahedipour aa71fef66f agency-test should not break during reelection 2017-01-16 13:11:42 +01:00
Kaveh Vahedipour aad9d6d576 agency-test should not break during reelection 2017-01-16 13:05:47 +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
jsteemann e85177b593 fixed cursor printing behavior 2017-01-12 17:26:20 +01:00
Manuel B e82c073de3 fix more 
added _printPos to fix the more cmd. thanks @jsteemann
 2017-01-12 13:40:51 +01:00
Manuel B 1f73f0aadd restore the cursor position 
This restores the cursor position after the toString() method consumed the first 10 results.
#2257
 2017-01-11 22:41:27 +01:00
Andreas Streichardt 97b49e79de Add cluster sync tests 2017-01-11 18:18:51 +01:00
Simon Grätzer 0b5a1f6b70 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-11 14:47:00 +01:00
Kaveh Vahedipour abbc32ae33 move shard jobs fail early if the contracting goes south 2017-01-11 12:13:05 +01:00
Kaveh Vahedipour 7b023bd66f move shard jobs fail early if the contracting goes south 2017-01-11 11:50:18 +01:00
Simon Grätzer 01ac5a51a3 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-09 21:12:24 +01:00
jsteemann 75263042c8 added tests for dropping indexes 2017-01-09 15:56:36 +01:00
Simon Grätzer 20d32d05b2 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangod/VocBase/LogicalCollection.cpp
 2017-01-09 13:34:37 +01:00
Frank Celler 9290d89412 removed superfluous dashes 2017-01-06 14:15:45 +01:00
Kaveh Vahedipour ea4467e0d4 shortening resilienceFail 2017-01-05 12:21:27 +01:00
jsteemann 118a4a7778 more cache invalidation 2017-01-03 14:58:13 +01:00
Kaveh Vahedipour 084c3e2e73 more robust agency test 2016-12-30 11:33:58 +01:00
Simon Grätzer 9a6c7196a6 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-26 20:52:29 +01:00
Andreas Streichardt bceb5d7b46 disable cores during recovery setup 2016-12-22 16:40:51 +01:00
Simon Grätzer 344c3761ba Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-22 14:51:55 +01:00
Andreas Streichardt 97ac8d6be2 remove transact test 2016-12-22 13:43:17 +01:00
Simon Grätzer 96925c0e76 Working single phase async 2016-12-19 07:25:52 +01:00
Simon Grätzer e4951835aa Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-14 10:40:03 +01:00
jsteemann 3be94b6014 add caching for db._collection() on client side 2016-12-13 16:05:29 +01:00
jsteemann 4d76ef962b added count(details = true) for sharded collections 2016-12-13 16:03:49 +01:00
Simon Grätzer 730ea4755e Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	scripts/startLocalCluster.sh
 2016-12-09 14:30:19 +01:00
Kaveh Vahedipour 30a0243e3d redirects to myelf should be hinstory 2016-12-06 18:05:05 +01:00
Andreas Streichardt 11bd9381d5 Add satellite collections 2016-12-06 16:40:50 +01:00
Simon Grätzer b126e1dddb Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-06 14:57:09 +01:00
jsteemann 369b2c7bc6 added optional memory limit for AQL queries 2016-12-06 13:23:41 +01:00
Simon Grätzer 3142cc1505 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-05 01:19:56 +01:00
Simon Grätzer 0689ccaabb fixed some stuff, stopping still not working 2016-12-05 01:18:05 +01:00
jsteemann 2521dff57c fix error message returned by arangoimp in case of some secondary unique key constaint violations 2016-12-02 13:37:17 +01:00
Simon Grätzer 34714f8743 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-01 14:11:14 +01:00
Jan Steemann 8443d4317e Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-29 10:59:45 +01:00
Jan Steemann 6754761273 fix index persistence 2016-11-29 10:59:38 +01:00
Simon Grätzer bc4c441f30 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-25 17:03:26 +01:00
Kaveh Vahedipour 029ff44bb0 Merge back FMH to devel 2016-11-25 16:03:13 +01:00
Simon Grätzer 9bcf8cd407 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-25 12:30:39 +01:00
Michael Hackstein 37b124593f Unified ensureIndex on client and server libs. 2016-11-25 11:11:45 +01:00
Kaveh Vahedipour 41e1ba144f general transactions in agency comm 2016-11-25 09:24:41 +01:00
Kaveh Vahedipour 9733dcc724 Looks as if cluster.my-local-info and cluster.myid are for the past 2016-11-22 17:48:04 +01:00
Kaveh Vahedipour ab34880bea Merge remote-tracking branch 'origin/devel' into FMH 2016-11-22 10:30:25 +01:00
Simon Grätzer e4bc60a755 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-21 17:44:12 +01:00
Jan Steemann 0ff5e4c07c wrote tests for shell return codes 2016-11-21 11:34:49 +01:00
Alan Plum 2f07366b8f
Implement process.stdout.isTTY 2016-11-19 18:42:29 +01:00