1
0
Fork 0
Commit Graph

33672 Commits

Author SHA1 Message Date
jsteemann 028b5f8ece Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-07 12:07:06 +02:00
jsteemann dfca849325 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-07 12:06:43 +02:00
jsteemann 195b8a549a removed unused variables 2016-09-07 12:05:56 +02:00
jsteemann 96eabfc64a added line break 2016-09-07 11:58:00 +02:00
Kaveh Vahedipour 288f42c531 constituent starting anyway without inception 2016-09-07 11:52:21 +02:00
jsteemann 13a3470087 Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-07 11:44:54 +02:00
jsteemann 9611f30796 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-07 11:44:49 +02:00
jsteemann 528ebdf573 slightly prefer primary index 2016-09-07 11:42:13 +02:00
Kaveh Vahedipour 2499c3e2e8 typo 2016-09-07 11:12:53 +02:00
Kaveh Vahedipour 57453c96c5 Logging in cluster. No votes in constituent before vocbase != nullptr 2016-09-07 11:09:33 +02:00
Kaveh Vahedipour a37d073813 a candidate of a leader could ask a strarting up agent for a vote before it having a vocbase. 2016-09-07 11:02:15 +02:00
Mark f0c0359e47 changed default for keepNull of modifyVertex/modifyEdge to true in Gharial 2016-09-07 10:51:16 +02:00
jsteemann 32d35f25af Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-07 10:35:29 +02:00
Jan Christoph Uhde 55777598e8 add more velocypack support to replication-dump 2016-09-07 10:34:48 +02:00
Mark 03d7e3ea0a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-09-07 10:31:49 +02:00
Mark e417e34d0e changed default for keepNull of modifyVertex/modifyEdge to true in Gharial 2016-09-07 10:31:35 +02:00
Andreas Streichardt d258e75cd1 Fix jslint 2016-09-07 10:31:08 +02:00
jsteemann 98dc073774 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-07 10:01:49 +02:00
jsteemann 2e8aef676b Merge branch 'generic-col-types' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-07 10:01:41 +02:00
jsteemann 84b750597d added test 2016-09-07 10:01:35 +02:00
Jan Steemann f80b36b6ff Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-09-07 09:59:49 +02:00
Jan Steemann a79c8360d4 fixed issue #2039 2016-09-07 09:59:41 +02:00
Michael Hackstein 8826f7ef08 Merge branch 'generic-col-types' of github.com:arangodb/arangodb into generic-col-types 2016-09-07 09:55:11 +02:00
jsteemann e1c847b0f6 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-07 09:52:38 +02:00
Kaveh Vahedipour 78ecf6bc53 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-09-07 09:50:46 +02:00
Kaveh Vahedipour f5cb4e7e1e replaced sleep_for by wait in inception phase 2016-09-07 09:50:36 +02:00
Kaveh Vahedipour 55df580c78 bug fix in shutdown timer for tests 2016-09-07 09:49:47 +02:00
Michael Hackstein bdd485eb08 Revmod debug output. 2016-09-07 09:49:13 +02:00
Max Neunhoeffer 104fc6aeed Merge branch 'generic-col-types' of ssh://github.com/ArangoDB/ArangoDB into generic-col-types 2016-09-07 09:47:20 +02:00
Max Neunhoeffer 549367a15e Fix error check in tryLaunchTask. 2016-09-07 09:46:59 +02:00
Andreas Streichardt ee0312e65a Fix double lock during shutdown 2016-09-07 09:45:57 +02:00
Michael Hackstein acfbf48762 Improved error output in cluster mode whenever illegal information is found inside the agency. 2016-09-07 09:26:14 +02:00
Michael Hackstein 8ba5472768 Merge branch 'generic-col-types' of github.com:arangodb/arangodb into generic-col-types 2016-09-07 09:11:43 +02:00
jsteemann c14c6ab025 removed unused variables 2016-09-07 08:56:48 +02:00
jsteemann b8767c1bd8 Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-07 08:54:02 +02:00
jsteemann 8a4b51cb92 fixed compile error 2016-09-07 08:53:35 +02:00
jsteemann faf66d084c Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-07 08:52:14 +02:00
jsteemann f5a595f464 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-07 08:52:07 +02:00
Jan Steemann b59cc6f379 removed superfluous methods 2016-09-07 08:42:52 +02:00
Frank Celler 2a89f6b725 removed log 2016-09-06 23:26:32 +02:00
Frank Celler 845de0b021 moved to destructor, beginShutdown should not wait 2016-09-06 23:22:10 +02:00
Frank Celler 5a14ab5a12 silence warning 2016-09-06 23:20:56 +02:00
Frank Celler 650b325529 shutdown thread that is not started directly 2016-09-06 23:20:23 +02:00
Jan Christoph Uhde 6d55bb3805 Merge branch 'obi-velocystream' of github.com:arangodb/arangodb into obi-velocystream
* 'obi-velocystream' of github.com:arangodb/arangodb:
  fixed Graph-API Doku
2016-09-06 19:06:38 +02:00
Jan Christoph Uhde f195b09783 add part of sliceify in replication-dump 2016-09-06 19:05:49 +02:00
Michael Hackstein 4f50911c88 Fixed a bug in Traversal Explainer. Also fixed undefined behaviour when directly checking for an attribute omitting == true in early traversal filter. 2016-09-06 18:46:40 +02:00
jsteemann eac7eafc4e fix collection creation 2016-09-06 18:33:08 +02:00
Kaveh Vahedipour 2840d4a002 try to fix the shutdown in thread 2016-09-06 18:32:46 +02:00
Kaveh Vahedipour c0ec149752 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-09-06 18:14:22 +02:00
Kaveh Vahedipour b4d5afa7c9 testing constutuent shutdown correctness 2016-09-06 18:14:16 +02:00