1
0
Fork 0
Commit Graph

17 Commits

Author SHA1 Message Date
Dan Larkin 30efe6c136 Made more progress on dump tests. 2017-04-20 23:05:56 -04:00
jsteemann 6abc9c62f2 fixed after merge conflict 2017-04-20 23:05:14 +02:00
jsteemann 467a90f749 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-20 23:02:33 +02:00
jsteemann 84f1a012b9 some bugfixes 2017-04-20 22:59:35 +02:00
Dan Larkin b7f8854666 Made some progress on dump tests. 2017-04-20 16:23:35 -04:00
Simon Grätzer 2235a70e62 Fix shutdown 2017-04-20 19:17:13 +02:00
Simon Grätzer b304d35ac2 Added rocksdb background thread 2017-04-20 18:50:52 +02:00
Simon Grätzer 8bfdcaa000 Added TTL 2017-04-20 15:24:03 +02:00
Simon Grätzer 3444f91e51 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-20 13:34:41 +02:00
Simon Grätzer a04f991aa0 Fixed warning 2017-04-20 13:34:37 +02:00
jsteemann 2cf6b5c751 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-20 12:55:07 +02:00
jsteemann a24b5b0763 make more exception safe 2017-04-20 12:54:59 +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
Dan Larkin f494f45785 Added initial, stripped RocksDBRestReplicationHandler. 2017-04-19 17:30:06 -04:00
Simon Grätzer 93b31d6f42 Replication manager + test fixes 2017-04-19 18:20:47 +02:00