7 Commits

Author	SHA1	Message	Date
jsteemann	a6cb463e06	Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack	2016-01-05 00:25:10 +01:00
Frank Celler	1065a1bd2c	added work monitor	2016-01-04 15:33:06 +01:00
Max Neunhoeffer	225c8cd843	Work on TODOs.	2015-12-22 16:50:09 +01:00
jsteemann	adebf6e7c9	removed some iostream includes	2015-10-12 21:40:46 +02:00
Jan Steemann	14a2df7684	simplified startup phase w/ options parsing and feature initialization	2015-10-09 15:25:26 +02:00
Jan Steemann	7c428aceb9	increase default value of `--server.descriptors-minimum` to 1024	2015-10-05 11:07:03 +02:00
Jan Steemann	9f0384284f	moved files	2015-08-19 11:19:37 +02:00