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

32 Commits

Author SHA1 Message Date
Michael Hackstein 344979709e Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-04-26 09:36:09 +02:00
Michael Hackstein 52b3b67479 Fixed cluster restore of System Collections. 2017-04-26 08:58:17 +02:00
Jan Christoph Uhde 26112be584 do checking before creating copy of slice 2017-04-26 08:33:23 +02:00
Dan Larkin 9dd275b497 Fixed dump/restore tests. 2017-04-25 13:54:56 -04:00
Jan Christoph Uhde fca8f01df6 create logger state just in one place 2017-04-25 14:58:32 +02:00
Simon Grätzer 8aaac6d5a2 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-25 12:02:04 +02:00
Simon Grätzer 5d20b79c0f Incremental Sync 2017-04-25 12:01:58 +02:00
Jan Christoph Uhde e5447d2e8c prevent crashing of replication when not using mmfiles engine 2017-04-25 11:11:58 +02:00
Simon Grätzer 91fe0f01ea formatting 2017-04-24 15:55:21 +02:00
Simon Grätzer 7176d34169 Fixed incremental synced 2017-04-24 15:40:48 +02:00
Simon Grätzer 88dc999001 Counter manager fixes 2017-04-24 12:43:44 +02:00
Simon Grätzer df57b291f8 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-24 10:23:33 +02:00
Dan Larkin d7f56172fd Fixed a status return in replication handler. 2017-04-21 13:12:19 -04:00
Simon Grätzer 1265fb759c Merge + sync 
# Conflicts:
#	arangod/RocksDBEngine/RocksDBReplicationContext.h
 2017-04-21 18:11:01 +02:00
Simon Grätzer e850dd635a Incremental sync 2017-04-21 18:10:10 +02:00
Dan Larkin 557eddb912 Added batchSize support to collection dumping. 2017-04-21 11:51:56 -04:00
jsteemann 862ec7bae3 remove log garbage 2017-04-21 12:57:20 +02:00
Dan Larkin 30efe6c136 Made more progress on dump tests. 2017-04-20 23:05:56 -04:00
Dan Larkin c46d4c6a6f Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-20 18:04:36 -04:00
Dan Larkin 9d6aa4b297 Some more replication handler changes. 2017-04-20 18:04:33 -04:00
jsteemann c0348c2840 more fixes 2017-04-20 23:23:04 +02:00
jsteemann 493154a319 fix inventory when there is no batchId 2017-04-20 23:14:58 +02:00
Dan Larkin b7f8854666 Made some progress on dump tests. 2017-04-20 16:23:35 -04:00
Dan Larkin 57701ff766 Added (rough) logger-follow handler. 2017-04-20 14:59:49 -04:00
Jan Christoph Uhde 96b05c0f61 work on dump for rocksdb replication 2017-04-20 15:58:48 +02:00
Simon Grätzer 8bfdcaa000 Added TTL 2017-04-20 15:24:03 +02:00
Simon Grätzer a04f991aa0 Fixed warning 2017-04-20 13:34:37 +02:00
Simon Grätzer 3319a5d607 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
# Conflicts:
#	arangod/RocksDBEngine/RocksDBRestReplicationHandler.cpp
 2017-04-20 12:47:22 +02:00
Simon Grätzer 388121158e Started inventory rest handler 2017-04-20 12:16:40 +02:00
Jan Christoph Uhde 325c64773d make use of ReplicationManager and ReplicationContext 2017-04-20 12:05:40 +02:00
Jan Christoph Uhde 7889291247 add contextId to replication handler 2017-04-20 10:56:17 +02:00
Dan Larkin f494f45785 Added initial, stripped RocksDBRestReplicationHandler. 2017-04-19 17:30:06 -04:00