1
0
Fork 0
Commit Graph

10 Commits

Author SHA1 Message Date
jsteemann e5d733867e make more tests pass 2017-04-05 14:57:18 +02:00
jsteemann 14921c6fba Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-04 15:27:32 +02:00
jsteemann b293668bb0 cppcheck 2017-04-04 15:27:28 +02:00
Simon Grätzer 245b4b87ea Fixing comparator use 2017-04-04 14:11:14 +02:00
Simon Grätzer c123ac3734 Fixed truncate 2017-04-04 10:48:37 +02:00
Simon Grätzer 664f45d029 Fixed counter 2017-04-03 15:16:14 +02:00
Simon Grätzer 64101eebec Fixed deadlock 2017-04-03 15:00:37 +02:00
Simon Grätzer c46db78904 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api
# Conflicts:
#	arangod/RocksDBEngine/RocksDBCommon.h
#	arangod/RocksDBEngine/RocksDBEngine.cpp
2017-04-03 13:27:04 +02:00
Simon Grätzer cf4294c9ca Integrated counters with collections 2017-04-03 13:24:22 +02:00
Simon Grätzer 01036b65d9 Added counter manager 2017-04-03 09:23:35 +02:00