1
0
Fork 0
Commit Graph

33720 Commits

Author SHA1 Message Date
Kaveh Vahedipour 1ce5b67cf0 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-09-06 16:52:52 +02:00
Kaveh Vahedipour a9ce21c80e minor 2016-09-06 16:52:03 +02:00
Andreas Streichardt 7b4a383877 Fix resilience tests 2016-09-06 16:49:54 +02:00
Andreas Streichardt 6396ac4dc7 Implement removeServer job 2016-09-06 16:49:25 +02:00
Max Neunhoeffer e23c08c49f Merge branch 'generic-col-types' of ssh://github.com/ArangoDB/ArangoDB into generic-col-types 2016-09-06 16:30:25 +02:00
Max Neunhoeffer c83c5200cf Fix behaviour of tryLaunchJob when database is dropped. 2016-09-06 16:29:52 +02:00
jsteemann a6cdc648a1 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-06 15:41:56 +02:00
jsteemann 3ad8063283 Merge branch 'generic-col-types' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-06 15:41:37 +02:00
jsteemann aa64e86d72 fixed invalid read 2016-09-06 15:41:31 +02:00
jsteemann 0970715708 properly set response code on redirect 2016-09-06 15:41:15 +02:00
Mark af9585dc14 fixed Graph-API Doku 2016-09-06 15:38:22 +02:00
Mark 51f84ec912 Merge branch 'obi-velocystream' of https://github.com/arangodb/arangodb into obi-velocystream 2016-09-06 15:36:37 +02:00
Mark 74f4667558 fixed Graph-API Doku 2016-09-06 15:34:54 +02:00
Jan Christoph Uhde cea8110c2e run clang-format on replication-dump 2016-09-06 15:24:16 +02:00
Max Neunhoeffer 6adc95ddce Merge branch 'generic-col-types' of ssh://github.com/ArangoDB/ArangoDB into generic-col-types 2016-09-06 14:59:42 +02:00
jsteemann 733de3b5f0 initialize some pointer variables 2016-09-06 14:47:09 +02:00
jsteemann 9eedec00b2 remove some unused assignments 2016-09-06 14:46:48 +02:00
Jan Christoph Uhde af8649479f clean up code 2016-09-06 14:46:37 +02:00
jsteemann e9bad5eee7 fix error after merge 2016-09-06 14:44:31 +02:00
jsteemann b718f67ff6 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-06 14:40:51 +02:00
jsteemann 68ebbabe17 delete unused collection directories 2016-09-06 14:40:31 +02:00
Max Neunhoeffer c083693ef0 Better error reporting in tryLaunchTask. 2016-09-06 14:28:00 +02:00
Jan Steemann 536e928329 fixed invalid pointers 2016-09-06 14:22:32 +02:00
Kaveh Vahedipour f2d8dbe175 agency tests wait for leadership to be established 2016-09-06 14:13:57 +02:00
Kaveh Vahedipour 64887d6a86 agency tests wait for leadership to be established 2016-09-06 14:10:54 +02:00
Jan Christoph Uhde 44d7f0ffad do not even try to answer on error on protocol level 2016-09-06 13:55:35 +02:00
Jan Christoph Uhde 275ebf566f add patch requested by mark 2016-09-06 13:42:47 +02:00
jsteemann 1018bad5c3 removed many unnecessary try...catch blocks 2016-09-06 13:27:17 +02:00
jsteemann 5c9d015a28 fixed some explainer errors 2016-09-06 13:27:04 +02:00
Jan Christoph Uhde 905c06d88e add new agent to allow 2 answers to one message 2016-09-06 13:26:27 +02:00
jsteemann 9949b0b27c fix memleaks 2016-09-06 12:09:33 +02:00
jsteemann 6ddf8bab54 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-06 11:22:14 +02:00
jsteemann 6ad39e26d6 jslint 2016-09-06 11:12:22 +02:00
jsteemann b161f5b9aa test adjustments 2016-09-06 11:10:17 +02:00
jsteemann 68153fafb6 cppcheck 2016-09-06 10:58:24 +02:00
jsteemann caba67dafb Merge branch 'generic-col-types' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-06 10:49:54 +02:00
jsteemann ffa00e26a0 some index cleanup 2016-09-06 10:49:40 +02:00
Kaveh Vahedipour 85ea1d5ff9 clang-format 2016-09-06 10:01:33 +02:00
Kaveh Vahedipour 030d3f146e minor 2016-09-06 09:55:52 +02:00
Michael Hackstein abd0161adc Merge branch 'generic-col-types' of github.com:arangodb/arangodb into generic-col-types 2016-09-06 09:55:20 +02:00
Michael Hackstein e22014a272 Merge branch 'MIT' of github.com:arangodb/arangodb into generic-col-types 2016-09-06 09:33:23 +02:00
Kaveh Vahedipour c90f1dcb76 minor 2016-09-06 09:27:00 +02:00
Kaveh Vahedipour 3086b45178 agency tests for replace/erase in kv-store 2016-09-06 09:25:25 +02:00
Kaveh Vahedipour 9941c74b9d inaccuracies in timing may yield wrong results in agency tests for ttls 2016-09-06 08:56:14 +02:00
Kaveh Vahedipour 51b6888549 new agency operators REPLACE and ERASE 2016-09-05 18:08:23 +02:00
Jan Christoph Uhde d0fdfa727a Merge branch 'generic-col-types' of github.com:arangodb/arangodb into obi-velocystream
* 'generic-col-types' of github.com:arangodb/arangodb:
  Improve version handling in ClusterInfo.
  Add further logging where a bug is likely.
  make error message unambiguous

Conflicts:
	lib/Rest/HttpResponse.cpp
2016-09-05 16:42:41 +02:00
Jan Christoph Uhde 4c473753b7 begin to fix RestReplicationHandler 2016-09-05 16:39:42 +02:00
Jan Christoph Uhde 6a3d6e080b remove comments 2016-09-05 16:39:05 +02:00
Max Neunhoeffer 49d7cf345f Improve version handling in ClusterInfo. 2016-09-05 16:03:28 +02:00
Andreas Streichardt f9fea70c3e readd method 2016-09-05 15:50:41 +02:00