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

812 Commits

Author SHA1 Message Date
jsteemann 1823ae4fd2 removed unused forwards and functions 2016-02-25 00:48:06 +01:00
jsteemann 74fa6cf207 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-25 00:02:03 +01:00
jsteemann 851d19a9d6 logging simplifications 2016-02-25 00:00:18 +01:00
Frank Celler da7955e417 Merge branch 'devel' of github.com:arangodb/arangodb into solaris 2016-02-24 19:29:01 +01:00
Frank Celler 4b2b85f1b5 more cleanup 2016-02-24 19:19:04 +01:00
Jan Steemann e61aec11dd Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-24 18:52:09 +01:00
Frank Celler df0fe99d5e fixed merge conflict 2016-02-24 18:47:27 +01:00
Frank Celler 6e851249e3 fixed superfluous _stop 2016-02-24 18:40:33 +01:00
Jan Steemann 97968b81dc fixed potential undefined behavior 2016-02-24 18:28:46 +01:00
Kaveh Vahedipour 86be0136ec agency on 2016-02-24 18:26:32 +01:00
Jan Steemann 4bbccedf0d Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-24 17:46:40 +01:00
Andreas Streichardt 370dbebec8 Allow existing directories during init 2016-02-24 17:31:14 +01:00
Frank Celler bed46519f9 added DETACHED state 2016-02-23 15:27:36 +01:00
Jan Steemann 70d44f06fa Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-23 13:22:46 +01:00
Frank Celler a140ad9de2 added DETACHED state 2016-02-23 12:26:12 +01:00
Jan Steemann b9d7fc479c fixed warning 2016-02-22 13:30:17 +01:00
Jan Steemann ea3a7f3dab removed cap constraints 2016-02-22 12:37:16 +01:00
Kaveh Vahedipour 89fba8f8d9 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-02-19 11:35:03 +01:00
Jan Steemann d7963c651b Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-18 12:55:49 +01:00
Frank Celler 345712c36f changed to new Thread interface 2016-02-17 22:19:37 +01:00
Kaveh Vahedipour 388ca14aa7 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-02-17 09:44:09 +01:00
Kaveh Vahedipour 46da26fe77 Pulling from devel 2016-02-16 10:50:26 +01:00
Jan Steemann 242481a501 small code refactoring 2016-02-15 17:02:36 +01:00
Michael Hackstein a3cd1aa54e Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-02-15 10:25:31 +01:00
Max Neunhoeffer 1065486a77 First version of getting shards in sync working. 2016-02-13 23:04:20 +01:00
Max Neunhoeffer 88074e52cc Activate _docColls. 2016-02-10 08:38:08 +01:00
Max Neunhoeffer dc63cb3874 Merge branch 'devel' into ClustUp2 2016-02-09 15:52:36 +01:00
Max Neunhoeffer fb17ac372b Report new follower to agency. 2016-02-09 15:51:58 +01:00
Jan Steemann 3b1c3cd37d prevent compile warning with clang 2016-02-04 19:31:44 +01:00
Jan Steemann 34c402cb05 attempt to fix assertion in Cluster 2016-02-04 15:29:02 +01:00
Andreas Streichardt 63b2cdbe1b fix code review comments 2016-02-04 13:40:15 +01:00
Andreas Streichardt 9e7beb9a6e Change LOG WARNING and ERROR 2016-02-04 11:43:10 +01:00
Kaveh Vahedipour df4508f59d Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-02-04 11:40:54 +01:00
Andreas Streichardt f096580706 Merge remote-tracking branch 'upstream/devel' into initializecluster 2016-02-04 11:37:02 +01:00
Andreas Streichardt adce528373 Proper initialization 
Also find a fitting spot for our role
 2016-02-04 11:29:43 +01:00
Max Neunhoeffer 777783a41e Add a non-nullptr asserting in asyncRequest. 2016-02-04 10:53:29 +01:00
Max Neunhoeffer 7a92f3ac0f Merge branch 'devel' into ClustUp2 2016-02-04 09:39:46 +01:00
Max Neunhoeffer 048f523714 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-02-04 09:00:43 +01:00
Max Neunhoeffer 391c03e68a Fix initial value of HTTP response code in ClusterComm. 2016-02-04 09:00:23 +01:00
Frank Celler bb3acf8cd5 fixed /_admin/log 2016-02-04 00:41:50 +01:00
Michael Hackstein 6315ec26a5 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-02-03 10:48:27 +01:00
Max Neunhoeffer ac51c221b3 Merge branch 'devel' into ClustUp2 2016-02-03 08:55:01 +01:00
Max Neunhoeffer 300d2b68e9 Another snapshot. 2016-02-03 08:54:27 +01:00
Jan Steemann bfd5d6614a fixed namespace usage 2016-02-02 15:10:44 +01:00
Andreas Streichardt e5ec93223f Oops ... fix signature 2016-02-01 19:05:05 +01:00
Andreas Streichardt b8204d0f3c initialize cluster structure 2016-02-01 18:59:01 +01:00
Michael Hackstein 197292a230 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-02-01 13:02:49 +01:00
Jan Steemann b7abf5a40d attempt to fix Windows build 2016-02-01 12:04:28 +01:00
Michael Hackstein b85d5d4a26 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-02-01 09:49:29 +01:00
Michael Hackstein 9ea8e3ea0c Started to write merge of two slices. This is not yet working for null means delete, works for all other merges. 2016-02-01 09:49:19 +01:00
jsteemann ae25d2b53b removed `using namespace std` 2016-01-31 18:22:00 +01:00
jsteemann 2d7323a560 fixed warnings shown by clang-3.7 2016-01-31 02:17:36 +01:00
jsteemann 353c9732b7 removed last LOG_xxx macros 2016-01-30 04:03:18 +01:00
jsteemann ff21453255 logger transition: all files in arangod exception transactions.cpp 2016-01-29 23:28:44 +01:00
Jan Steemann 828f46c76b shut up compiler 2016-01-29 19:19:06 +01:00
Michael Hackstein e0f0a6f1a8 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-01-29 14:18:05 +01:00
Michael Hackstein 436c377cb5 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-01-29 14:01:53 +01:00
Max Neunhoeffer 238937128a Merge branch 'devel' into ClustUp2 2016-01-29 13:59:11 +01:00
Max Neunhoeffer dcf4ed8bca Sort out FollowerInfo. 2016-01-29 13:56:37 +01:00
Andreas Streichardt 9850058d01 Merge branch 'devel' into waitforagency 2016-01-29 11:27:35 +01:00
Jan Steemann 2112d7c1f8 added override and final specifiers 2016-01-29 11:10:46 +01:00
Jan Steemann b82e9c692a removed unnecessary block 2016-01-29 11:10:24 +01:00
Andreas Streichardt b83184cfbb typo 2016-01-28 18:35:37 +01:00
Andreas Streichardt 54569ac01a Wait for agency to come up 2016-01-28 18:13:23 +01:00
Michael Hackstein 582f1f46f0 Preparation for multi-direction traversals. As requested in #1683. Internal traverser can now work with one direction per collection. Next: AQL needs to learn this too. 2016-01-28 14:07:50 +01:00
Frank Celler 175e1e6b51 moved low level mutex in Mutex class 2016-01-27 15:31:02 +01:00
Max Neunhoeffer 6ff1538000 Change namespace. 2016-01-27 15:21:40 +01:00
Michael Hackstein 19cfa3429c Fixed another cluster indexes bug. 2016-01-27 14:24:00 +01:00
Jan Steemann 9046e1831b clang-format 2016-01-27 13:43:46 +01:00
Michael Hackstein 32c159f352 Fixed a bug when creating indexes in cluster. Their information was not returned correctly. 2016-01-27 13:26:42 +01:00
Max Neunhoeffer 887e571a26 Merge branch 'devel' into ClustUp2 2016-01-26 18:01:42 +01:00
Michael Hackstein 6f4d8ca509 Fixed invalid storage of Collection status in Cluster 2016-01-26 17:19:37 +01:00
Jan Steemann 3fc862f0ef changed locking macros 2016-01-26 15:39:12 +01:00
Michael Hackstein f9ada16a89 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-01-26 13:27:41 +01:00
Michael Hackstein 969ac75d19 Removed all TRI_json_t references from v8-vocindex and all it's surroundings 2016-01-26 13:27:21 +01:00
Max Neunhoeffer bee3f7e21a Cleanup ClusterComm library. Allow singleRequest asyncRequests. 
Also run ClusterComm sender thread and connection manager in
single server mode.
 2016-01-26 11:05:15 +01:00
Michael Hackstein 18b66d5c83 Removed TRI_json_t entirely from AgencyComm. Also no legacy support anymore. 2016-01-25 16:39:56 +01:00
Michael Hackstein 5b48989e8b Fixed bug in agency. Index was not read correctly 2016-01-25 10:42:23 +01:00
Michael Hackstein a6f58ce14d Use forward declarations for VelocyPack instead of all includes everywhere 2016-01-24 14:29:31 +01:00
Michael Hackstein 191c2dc3a9 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-01-21 16:29:38 +01:00
jsteemann 6f0be080fa unification of sub-thread naming 2016-01-21 00:51:51 +01:00
jsteemann 842384016d namespace cleanup 2016-01-21 00:20:22 +01:00
Michael Hackstein 77b12f872f Explicitly deleted TRI_Json_t sending requests in Agency. To avoid invoking the wrong function again 2016-01-20 14:47:56 +01:00
Michael Hackstein 09d041f303 Fixed Cluster error for dropping Indexes. Nasty and hard to find Error, compiler autocasted pointer to bool und actually called the wrong function. 2016-01-20 14:21:44 +01:00
Michael Hackstein 636d284607 Removed debug output 2016-01-20 14:20:50 +01:00
Michael Hackstein 3c6ac9f38f Removed all TRI_json_t inputs to AgencyComm and replaced them by VPack. This commit stil has an error s.t. indexes cannot be dropped in Cluster. WIP. 2016-01-20 12:53:55 +01:00
Michael Hackstein 1edd5b3007 Now AgencyComm only communicates via VPack to Agency. A mix of TRI_json_t and VPack is impossible do to different ordering when comparing values 2016-01-19 15:37:48 +01:00
Michael Hackstein 7f4980e87d Cluster internal communication now uses more VPack instead of TRI_json_t 2016-01-19 11:33:43 +01:00
Jan Steemann 5daa529404 compaction fix attempt II 2016-01-18 18:24:25 +01:00
Michael Hackstein 8a1b105986 Increasing versions in AgencyComm now uses VelocyPack (breaking change, uint64_t is not stored as strings any more 2016-01-17 12:39:43 +01:00
Michael Hackstein b2b73bc57d Server State in Cluster is now send as VelocyPack 2016-01-17 12:31:31 +01:00
Michael Hackstein c76c7df2aa Cluster Version counter nwo use VPack internally 2016-01-17 12:28:19 +01:00
Michael Hackstein bb4e1156ad AgencyLocker now internally uses VPack instead of TRI_json_t 2016-01-17 12:22:05 +01:00
jsteemann 431900f17a changed namespace from triagens to arangodb 2016-01-17 00:44:53 +01:00
Michael Hackstein fc8b45b06f Parsing the result in cluster is now done through VPack 2016-01-16 23:43:02 +01:00
Michael Hackstein e1a63aa5a0 Agency comm errorCode und Message are now parsed via VelocyPack. 2016-01-16 23:24:36 +01:00
Michael Hackstein 341eda3d4f Removed obsolete function 2016-01-16 15:34:30 +01:00
Michael Hackstein aa1b1f499a Merge branch 'vpack' of github.com:arangodb/arangodb into devel 2016-01-16 15:21:25 +01:00
Jan Steemann 583bc90626 fixed leak 2016-01-15 16:27:36 +01:00
Michael Hackstein f3806171f5 Reduced occurences of TRI_json_t in Cluster Code 2016-01-15 15:32:47 +01:00
jsteemann 1b959c827d more const unification 2016-01-15 00:09:52 +01:00
jsteemann f66eb007cd some const unification 2016-01-15 00:03:03 +01:00
Max Neunhoeffer b0283077db Merge branch 'devel' into ClustUp2 2016-01-11 11:41:36 +01:00
Max Neunhoeffer dd364a9d20 Fix merge. 2016-01-11 11:38:10 +01:00
Max Neunhoeffer e7eae3a73a Merge branch 'devel' into ClustUp2 2016-01-11 11:01:45 +01:00
Jan Steemann 687d6133f0 comments reformatting 2016-01-11 09:52:39 +01:00
jsteemann 9f0576c65f don't rely so much on namespace std being present 2016-01-08 01:05:06 +01:00
jsteemann 50c0e18d53 removed useless con|destructor comments 2016-01-07 21:19:53 +01:00
Jan Steemann 8b4b6a1943 moved docu blocks into their own files 2016-01-07 16:03:17 +01:00
Jan Steemann 3ad20c0cae auto-generated headers 2016-01-06 18:41:51 +01:00
Jan Steemann a3b026d9d1 removed useless sections from code, unified include guards 2016-01-06 14:15:22 +01:00
Jan Steemann 3e0dd5dd14 fixed cluster shutdown 2016-01-05 18:30:26 +01:00
Jan Steemann f422576ee0 clang-format 2016-01-05 17:43:24 +01:00
jsteemann a6cb463e06 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2016-01-05 00:25:10 +01:00
Frank Celler 1065a1bd2c added work monitor 2016-01-04 15:33:06 +01:00
Max Neunhoeffer aee4bd266c Set heartbeat interval to 5s. 2015-12-29 15:47:57 +01:00
Max Neunhoeffer e81af6274a Add replicationFactor and replicationQuorum. 2015-12-28 14:47:27 +01:00
Max Neunhoeffer 79b5175212 Add followerInfos in ClusterInfo. 2015-12-28 14:31:16 +01:00
Max Neunhoeffer c7f00bfeda Continue work on TODOs. 2015-12-23 14:40:04 +01:00
Max Neunhoeffer 225c8cd843 Work on TODOs. 2015-12-22 16:50:09 +01:00
Jan Steemann fb0a522081 fixed compile error 2015-12-22 14:19:32 +01:00
Max Neunhoeffer 989e92761b Merge branch 'vpack' of ssh://github.com/ArangoDB/ArangoDB into vpack 2015-12-22 14:18:46 +01:00
Max Neunhoeffer 5f3a1fbdb2 Merge branch 'devel' into vpack 2015-12-22 14:18:34 +01:00
Max Neunhoeffer 152f3485b3 Fix dump bug in cluster. 2015-12-22 14:18:11 +01:00
Jan Steemann 1b1e42b1b9 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-22 14:15:22 +01:00
jsteemann 13fb41c6b0 removed useless flag 2015-12-22 14:15:02 +01:00
Jan Steemann a3898bd54e fixed test 2015-12-22 11:27:05 +01:00
jsteemann a058699312 use std::make_shared 2015-12-18 23:34:18 +01:00
Max Neunhoeffer 0743885dec Fix handling of VPackOptions in Parser/Builder usage. 
Also fix TRI_json_t* handling for cluster methods.
 2015-12-18 20:42:59 +01:00
Jan Steemann 2b3f3f997b Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-17 10:59:30 +01:00
Michael Hackstein 82eea28fea Merge branch 'vpack' of github.com:arangodb/arangodb into vpack 2015-12-16 19:03:15 +01:00
Jan Steemann 35eda37ab1 make_unique 2015-12-16 11:54:33 +01:00
Jan Steemann 8e18d6463f Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-12-16 11:44:56 +01:00
Michael Hackstein ef3889363f Adapted cluster communication to class version of TRI_col_info_t 2015-12-16 11:42:02 +01:00
Jan Steemann a694b7ef48 make_unique 2015-12-16 11:36:35 +01:00
Max Neunhoeffer 5a350b4391 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2015-12-16 10:59:18 +01:00
Max Neunhoeffer 98fa31818a Cleanup. 2015-12-16 10:59:10 +01:00
Michael Hackstein 2867ff1eb4 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-12-16 10:52:08 +01:00
Michael Hackstein e6e66d4469 Fixed a bug in Traversal Path Uniqueness. 2015-12-16 10:51:54 +01:00
Max Neunhoeffer 1a0687a07a Fix move constructor and move assignment operator for CollectionInfo. 2015-12-16 10:41:11 +01:00
Max Neunhoeffer c376200978 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2015-12-16 10:29:50 +01:00
Max Neunhoeffer b337d9bd29 Fix shared_ptr<CONTAINER> direct-use in for bug. 2015-12-16 10:29:23 +01:00
Jan Steemann 65ede56176 make constructor explicit 2015-12-16 10:08:48 +01:00
Jan Steemann acf2dcf7b5 fixed leak 2015-12-16 10:08:21 +01:00
Max Neunhoeffer 0198b4576b Merge branch 'devel' into ClustUp1 2015-12-15 20:40:52 +01:00
Max Neunhoeffer 754762c277 Fix improvement of memory management for ClusterComm. 2015-12-15 18:24:26 +01:00
Max Neunhoeffer 74b147bb20 Improve memory management in ClusterComm library. 2015-12-15 18:09:55 +01:00
Michael Hackstein f589308bd0 Implemented unique edges on path for AQL traversal in cluster case 2015-12-15 18:04:14 +01:00
Max Neunhoeffer 4451e491ec Merge branch 'devel' into ClustUp1 2015-12-15 17:46:34 +01:00
Jan Steemann ad8381ad6a Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-15 16:37:33 +01:00
Alan Plum 8853ede355 org/arangodb -> @arangodb 2015-12-15 15:51:44 +01:00
Jan Steemann f8cf665a8a delete connectionmanager on shutdown 2015-12-15 13:21:24 +01:00
Max Neunhoeffer 8a69ca5367 Merge branch 'devel' into ClustUp1 2015-12-15 09:23:51 +01:00
Jan Steemann 84fae4ebcb Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-14 18:16:30 +01:00
Jan Steemann 1b86f280de small issues 2015-12-14 17:54:46 +01:00
Max Neunhoeffer 5bf896c51f Fix if-match forwarding bug in getDocumentOnCoordinator. 2015-12-14 16:17:13 +01:00
Max Neunhoeffer 6ca9bd4e70 Improve ClusterComm pointer usage. 2015-12-14 14:27:04 +01:00
Max Neunhoeffer 7641feeb88 Fix ClusterComm library w.r.t. pointers. 2015-12-14 11:22:30 +01:00
Max Neunhoeffer af4d729284 The ClusterComm C++11 revolution. 2015-12-11 23:26:10 +01:00
Michael Hackstein 1a33c10557 Removed TRI_json_t from Vocbase/auth and did some refactoring in the internals there. Bye Bye CORE_MEM_ZONE 2015-12-10 14:08:49 +01:00
Max Neunhoeffer d5eaccbfe5 Merge branch 'devel' into ClustUp1 2015-12-10 11:35:08 +01:00
Michael Hackstein 1af985003d Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2015-12-10 10:26:14 +01:00
Max Neunhoeffer ea72850aeb Fix bug in client tests. 2015-12-09 23:13:26 +01:00
Jan Steemann fec29ac9c8 better compaction diagnostics 2015-12-09 19:02:22 +01:00
Max Neunhoeffer 7931be71a0 Merge branch 'devel' into ClustUp1 2015-12-09 12:45:07 +01:00
Michael Hackstein acadb089ee Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2015-12-09 10:29:13 +01:00
Michael Hackstein 7042542548 Fixed memleak for cluster Traverser edge data 2015-12-09 09:52:45 +01:00
Max Neunhoeffer c309c47981 Unuse std::atomic_load<shared_ptr> because gcc 4.9 does not have it. 2015-12-09 09:32:01 +01:00
Max Neunhoeffer 3f78b86492 Merge branch 'devel' into ClustUp1 2015-12-09 09:04:00 +01:00
jsteemann c99f4244c7 bugfix for cluster edges API 2015-12-09 00:26:18 +01:00
Max Neunhoeffer a0f6a3c9db Merge branch 'devel' into ClustUp1 2015-12-08 23:21:46 +01:00
Max Neunhoeffer f38d70844f Fix a corner case in index generation. 2015-12-08 21:32:06 +01:00
Max Neunhoeffer 588fddb53c Better error message instead of failed assertion. 2015-12-08 20:50:35 +01:00
Max Neunhoeffer a8bf9bd9ca Add a true argument. 2015-12-08 20:12:53 +01:00
Max Neunhoeffer 6cedb210df First try to fix deadlock problem. Tests not yet tried. 2015-12-08 18:54:05 +01:00
Jan Steemann 76d5f57af0 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-08 18:23:06 +01:00
Max Neunhoeffer 4e523a19ed Merge branch 'devel' into ClustUp1 2015-12-08 17:02:14 +01:00
Michael Hackstein 0a678263fb Fixed a bug when we start at an unknown vertex. THe cluster got into undefined states 2015-12-08 14:45:11 +01:00
Jan Steemann 14a7269278 make parameter explicit 2015-12-08 12:58:51 +01:00
Max Neunhoeffer 257c6c897d Fix bugs and tests. 2015-12-08 12:48:11 +01:00
Jan Steemann 04f3abae2a Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-07 16:51:21 +01:00
Max Neunhoeffer 637a234660 Change a debug into an error. 2015-12-07 16:01:44 +01:00
Max Neunhoeffer a674ff9629 Use no pretty printing in agency communication for VelocyPack. 2015-12-07 14:52:53 +01:00
Michael Hackstein 1c53e93865 Added some VelocyPack helper functions for Coordinators 2015-12-07 14:24:56 +01:00
Michael Hackstein b78145f73f Added some VelocyPack helper functions for Coordinators 2015-12-07 14:24:21 +01:00
Max Neunhoeffer 6141c61bf4 Merge branch 'devel' into ClustUp1 2015-12-07 13:44:13 +01:00
Max Neunhoeffer c11bdf9319 Two bug fixes. 2015-12-07 13:43:49 +01:00
Jan Steemann 9dd164eadc fix cluster upgrade 2015-12-07 11:57:46 +01:00
Jan Steemann e55199a27c fixed mismatched free/delete 2015-12-07 10:34:14 +01:00
Michael Hackstein a814bc7414 Added a wrapper arround create/modify documents in cluster with JSOn for VelocyPack 2015-12-06 13:32:06 +01:00
Max Neunhoeffer 10ff104236 Another snapshot. 2015-12-04 16:08:02 +01:00
Max Neunhoeffer 60df924ac1 Change data structures for collections in Agency. 
Snapshot, compiles, untested, needs new VelocyPack.
 2015-12-04 15:08:47 +01:00
Max Neunhoeffer a926c7570a Cleanup ClusterInfo library w.r.t. Current/Collections. 2015-12-04 15:08:47 +01:00
Jan Steemann 3b7cbef240 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-04 13:50:42 +01:00
Jan Steemann 5c033f566b Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-04 13:47:08 +01:00
Michael Hackstein c60271d3c8 Fixed early optimizations of Cluster traversal filters, when document does not exist. Now behaves identical to single server and to execution without optimization 2015-12-04 13:30:40 +01:00
Jan Steemann 785beaa625 cppcheck 2015-12-04 12:18:15 +01:00
Jan Steemann b8cd633276 Windows fixes 2015-12-03 15:00:19 +01:00
Michael Hackstein 86b4a7137d Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-12-03 11:35:33 +01:00
Michael Hackstein 04f65ff8c1 Fixed a memleak in ClusterTraverser 2015-12-03 11:35:08 +01:00