1
0
Fork 0
Commit Graph

258 Commits

Author SHA1 Message Date
Max Neunhoeffer f25c5175ac Kill further uses of update_policy. 2016-03-10 00:07:51 +01:00
Jan Steemann b393c3d9bb Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-09 09:42:10 +01:00
jsteemann d756f6a176 removed TRI_transaction_collection_t from public APIs 2016-03-09 01:51:17 +01:00
Frank Celler dfa9047484 switch arangosh to new ApplicationFeatures and ProgramOptions 2016-03-08 23:32:43 +01:00
Max Neunhoeffer af3d61c339 Fix complation. 2016-03-07 09:04:58 +01:00
Max Neunhoeffer ab82405e9a Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-07 08:43:38 +01:00
Max Neunhoeffer 9358fcb96f Commit some fixes. 2016-03-07 08:40:54 +01:00
Jan Steemann 05f98cbd72 fixed compile errors 2016-03-04 18:43:51 +01:00
Jan Steemann ad4a9542ea removed file 2016-03-04 18:32:54 +01:00
Jan Steemann c157363f3c less dependencies 2016-03-04 17:21:09 +01:00
jsteemann 0c580f1076 removed unused includes 2016-03-04 02:37:20 +01:00
jsteemann cf1427adff smaller datafile markers 2016-03-04 02:25:03 +01:00
jsteemann c2c509ef58 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-03 21:27:13 +01:00
Jan Steemann 3cadcd5340 less json 2016-03-03 15:40:00 +01:00
Jan Steemann 78f07c6a31 less json 2016-03-03 14:23:39 +01:00
Jan Steemann 0cb0c0142f remove _rid from master pointer 2016-03-01 15:06:54 +01:00
Jan Steemann 102066b4ee removed methods 2016-03-01 11:50:16 +01:00
Jan Steemann 88b6828abb re-added single-operation hints 2016-02-26 12:37:12 +01:00
Jan Steemann ebf2d1520b removed TRI_doc_mptr_copy_t 2016-02-26 11:46:33 +01:00
Jan Steemann 8f2e2de451 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-25 10:46:13 +01:00
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
Jan Steemann eb202f528c pass vocbase in TransactionContext 2016-02-23 13:03:30 +01:00
Jan Steemann f468cd00ad create transaction context as shared ptr 2016-02-23 12:18:39 +01:00
Jan Steemann 0a969caf23 removed SingleCollectionReadOnlyTransaction and SingleCollectionWriteTransaction 2016-02-23 11:05:44 +01:00
Jan Steemann 4277f7a131 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-22 09:41:44 +01:00
Frank Celler 74f7c71dcb fixed typo 2016-02-19 22:24:07 +01:00
Frank Celler 366855b680 set version to 3.x 2016-02-19 20:10:46 +01:00
Jan Steemann 0c4ab9054a API cleanup 2016-02-16 15:13:30 +01:00
Max Neunhoeffer 4cbd99a54b Merge branch 'devel' into ClustUp2 2016-02-13 23:06:22 +01:00
Max Neunhoeffer 1065486a77 First version of getting shards in sync working. 2016-02-13 23:04:20 +01:00
Jan Steemann dad000b883 use std::string to avoid potential leaks 2016-02-11 10:13:49 +01:00
Max Neunhoeffer 8b98ae5ef5 Snapshot for merging. 2016-02-11 09:11:00 +01:00
Max Neunhoeffer dc63cb3874 Merge branch 'devel' into ClustUp2 2016-02-09 15:52:36 +01:00
Jan Steemann 39c3d3d2a2 wait until applier has started 2016-02-09 10:54:37 +01:00
Jan Steemann 15c5dcf6ac change barrier type 2016-02-07 19:54:10 +01:00
Jan Steemann 42c4bdbebb ported from 2.8 2016-02-07 19:47:37 +01:00
jsteemann 63595cd740 forward port from 2.8 2016-02-07 00:35:02 +01:00
Jan Steemann a0cb3b1832 replication changes 2016-02-05 18:06:39 +01:00
Jan Steemann 1e7b43b3df make initial synchronization fail when master is restarted in the middle and no progress can be made 2016-02-05 14:00:49 +01:00
Jan Steemann 071d36c203 replication cleanup 2016-02-05 13:28:38 +01:00
Jan Steemann abd382bf19 replication cleanup 2016-02-05 13:08:12 +01:00
Jan Steemann d63fa1ad81 use dedicated REPLICATION log channel 2016-02-05 11:01:39 +01:00
Max Neunhoeffer daf2afe71a Merge branch 'devel' into ClustUp2 2016-02-01 12:30:45 +01:00
Jan Steemann b7abf5a40d attempt to fix Windows build 2016-02-01 12:04:28 +01:00
Max Neunhoeffer 0be190d85d Merge branch 'devel' into ClustUp2 2016-02-01 11:43:00 +01:00
Max Neunhoeffer 93400bfdcc Implement followerInfo. 2016-02-01 11:38:10 +01:00
jsteemann b635983d9c removed unused functions and headers 2016-01-31 19:08:39 +01:00
jsteemann ae25d2b53b removed `using namespace std` 2016-01-31 18:22:00 +01:00