1
0
Fork 0
Commit Graph

205 Commits

Author SHA1 Message Date
Michael Hackstein 8c7023850e Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-14 19:37:28 +02:00
Andreas Streichardt 612c387c56 Optimize version increase stuff 2016-04-14 18:17:25 +02:00
Michael Hackstein 483ca0d5b3 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-14 17:42:41 +02:00
Andreas Streichardt 7a8f101cfc Merge branch 'devel' into agency 2016-04-14 15:31:14 +02:00
Andreas Streichardt 1794be7c30 Version is now an Uint64 consistently 2016-04-14 13:29:36 +02:00
Jan Steemann 5c17402536 reduce number of agency requests a bit 2016-04-14 11:40:21 +02:00
Michael Hackstein 1e92fd3485 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-14 08:28:28 +02:00
Andreas Streichardt b77cc777ff Kill remaining watchValues 2016-04-13 15:35:17 +02:00
Michael Hackstein d67b203382 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-08 13:15:16 +02:00
Michael Hackstein 12d973504c Fixed babies creation in cluster with undefined keys. 2016-04-08 10:53:11 +02:00
Jan Steemann e4b1dd8f5f fixed tests for TRI_HashJsonByAttributes() 2016-04-07 19:55:42 +02:00
Michael Hackstein 6847d3f4a7 Preperation to create documents on coordinator with baby awareness. 2016-04-07 10:27:01 +02:00
Jan Steemann 9f8c24b1cd Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-04-06 15:43:27 +02:00
Frank Celler 068f9defd7 splitted HttpResponse.h 2016-04-01 10:39:38 +02:00
Frank Celler 486011d399 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-03-31 13:41:09 +02:00
Frank Celler 494bdca847 splitted HttpRequest into GeneralRequest/HttpRequest 2016-03-31 11:45:21 +02:00
Jan Steemann 881761d2d5 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-24 17:05:43 +01:00
Andreas Streichardt 9ba72b4412 Properly update current collection 2016-03-24 16:55:15 +01:00
jsteemann 279fb105e2 cppcheck 2016-03-09 22:57:49 +01:00
Jan Steemann b393c3d9bb Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-09 09:42:10 +01:00
Frank Celler dfa9047484 switch arangosh to new ApplicationFeatures and ProgramOptions 2016-03-08 23:32:43 +01:00
Jan Steemann 4de5e41044 simplifications 2016-03-04 17:48:27 +01:00
Jan Steemann 337fc4bca4 remove std::mutex 2016-03-03 17:47:46 +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
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
Max Neunhoeffer 1065486a77 First version of getting shards in sync working. 2016-02-13 23:04:20 +01:00
Max Neunhoeffer fb17ac372b Report new follower to agency. 2016-02-09 15:51:58 +01:00
Max Neunhoeffer 300d2b68e9 Another snapshot. 2016-02-03 08:54:27 +01:00
Jan Steemann b7abf5a40d attempt to fix Windows build 2016-02-01 12:04:28 +01:00
jsteemann 2d7323a560 fixed warnings shown by clang-3.7 2016-01-31 02:17:36 +01:00
jsteemann ff21453255 logger transition: all files in arangod exception transactions.cpp 2016-01-29 23:28:44 +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
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
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 969ac75d19 Removed all TRI_json_t references from v8-vocindex and all it's surroundings 2016-01-26 13:27:21 +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 191c2dc3a9 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-01-21 16:29:38 +01:00
jsteemann 842384016d namespace cleanup 2016-01-21 00:20:22 +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 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 7f4980e87d Cluster internal communication now uses more VPack instead of TRI_json_t 2016-01-19 11:33:43 +01:00
jsteemann 431900f17a changed namespace from triagens to arangodb 2016-01-17 00:44:53 +01:00