5 Commits

Author	SHA1	Message	Date
jsteemann	af9a214c9f	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel	2017-04-24 14:23:54 +02:00
jsteemann	507054de99	adjust include order	2017-04-24 13:50:54 +02:00
Simon Grätzer	88dc999001	Counter manager fixes	2017-04-24 12:43:44 +02: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