1
0
Fork 0
Commit Graph

161 Commits

Author SHA1 Message Date
jsteemann a221d30b8f added savepoints 2017-03-28 17:55:25 +02:00
Simon Grätzer b1f010e33c Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api
# Conflicts:
#	arangod/RocksDBEngine/RocksDBTransactionState.h
2017-03-28 17:23:38 +02:00
Simon Grätzer 913b60c983 Fix usleep 2017-03-28 17:15:05 +02:00
Jan Christoph Uhde 7b48e45fa2 add readOptions to transaction 2017-03-28 16:59:39 +02:00
jsteemann e9e0d3a46c remove unused attribute 2017-03-28 13:25:10 +02:00
jsteemann 9276d82578 remove debug log messages 2017-03-27 11:20:43 +02:00
jsteemann 2c54a6ac1e added some basic transaction handling 2017-03-24 17:23:32 +01:00
jsteemann 2aa2fd65a4 more startup 2017-03-24 14:20:51 +01:00
jsteemann 02c0dcc689 properly report error locations 2017-03-23 20:18:33 +01:00
Jan Christoph Uhde 68bb668f1b add more empty implementations for RocksDB Storage engine 2017-03-21 10:53:13 +01:00
Jan Christoph Uhde db8202fd50 Add empty RocksDBTransactionState implemenation 2017-03-20 16:48:39 +01:00