13 Commits

Author	SHA1	Message	Date
Simon Grätzer	29286a9c1b	RocksDB WAL entries for transactions	2017-04-26 18:54:55 +02:00
Simon Grätzer	d228a94462	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel ... # Conflicts: # arangod/Replication/InitialSyncer.cpp	2017-04-26 11:06:09 +02:00
jsteemann	d024a6d00a	remove logging for non-topics	2017-02-10 09:32:50 +01:00
Jan Christoph Uhde	66bf5be749	rename vpp to vst in server options and endpoint	2016-10-27 21:45:38 +02:00
Frank Celler	2dd798cd48	WIP	2016-04-15 22:09:55 -07:00
Frank Celler	cd91d3654e	Merge remote-tracking branch 'origin' into FMH	2016-04-15 19:01:38 -07:00
Frank Celler	8254bd4bd6	WIP	2016-04-14 21:32:12 -07:00
Jan Steemann	0c00738aff	fixes for Visual Studio	2016-04-08 12:07:53 +02:00
Jan Steemann	9f8c24b1cd	Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk	2016-04-06 15:43:27 +02:00
Frank Celler	0c5a6bcaf6	fixed boost tests	2016-04-04 13:25:57 +02:00
Max Neunhoeffer	f27e11bf64	Fix compilation.	2016-04-04 08:48:10 +02:00
Frank Celler	295c8a3809	MSVC fixes	2016-03-31 14:01:23 +02:00
Frank Celler	494bdca847	splitted HttpRequest into GeneralRequest/HttpRequest	2016-03-31 11:45:21 +02:00