Jan Steemann 7b521a4c9e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh ... Conflicts: arangod/VocBase/document-collection.cpp arangod/VocBase/document-collection.h		2014-05-30 12:51:20 +02:00
..
ApplicationAdminServer.cpp	More header cleanups.	2014-05-21 13:42:41 +02:00
ApplicationAdminServer.h	More header cleanups.	2014-05-21 13:42:41 +02:00
RestAdminBaseHandler.cpp	updated disclaimer	2013-03-13 17:03:18 +01:00
RestAdminBaseHandler.h	Header cleanup: use #include "Basics/Common.h" in all C++ files.	2014-05-21 15:50:30 +02:00
RestAdminLogHandler.cpp	fixed wrong URL in API description	2014-05-28 11:01:34 +02:00
RestAdminLogHandler.h	Further cleanup with #include "Basics/Common.h"	2014-05-21 16:59:54 +02:00
RestBaseHandler.cpp	added cancelation of asnyc jobs	2014-04-16 20:16:22 +02:00
RestBaseHandler.h	Further cleanup with #include "Basics/Common.h"	2014-05-21 16:59:54 +02:00
RestHandlerCreator.h	added cancelation of asnyc jobs	2014-04-16 20:16:22 +02:00
RestJobHandler.cpp	added more error information, fixed try catch	2014-04-21 13:35:06 +02:00
RestJobHandler.h	Further cleanup with #include "Basics/Common.h"	2014-05-21 16:59:54 +02:00
RestShutdownHandler.cpp	added requeue	2014-02-25 12:07:16 +01:00
RestShutdownHandler.h	Further cleanup with #include "Basics/Common.h"	2014-05-21 16:59:54 +02:00
RestVersionHandler.cpp	added ignore for certain API calls (version & aardvark)	2014-05-04 12:46:29 +02:00
RestVersionHandler.h	Further cleanup with #include "Basics/Common.h"	2014-05-21 16:59:54 +02:00