4 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
Michael Hackstein	bcc79cc1cf	AdminLogHandler and DebugHelperHandler now use generateResult for VelocyPack insted of TRI_json_t	2015-11-06 14:10:59 +01:00
Jan Steemann	1be3733a64	moved some handlers around ... fix disappeared handlers	2015-08-20 01:26:52 +02:00