6 Commits

Author	SHA1	Message	Date
Jan Steemann	8f150e942e	Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions ... Conflicts: CHANGELOG	2015-10-14 09:57:24 +02:00
Frank Celler	d99d86260d	logging will be done bevor the config file is parsed	2015-10-13 21:47:53 +02: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
CoDEmanX	956b396e43	Change spelling of 'initialize' to American English (actual code and files)	2015-09-01 17:29:22 +02:00
Jan Steemann	9f0384284f	moved files	2015-08-19 11:19:37 +02:00