Jan Steemann c38c038492 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding ... Conflicts: CHANGELOG js/apps/system/aardvark/frontend/css/collectionsItemView.css js/apps/system/aardvark/frontend/css/graphlayout.css		2014-02-06 13:18:52 +01:00
..
RestBatchHandler.cpp	make usage of batch API easier	2014-01-21 17:56:49 +01:00
RestBatchHandler.h	removed second logger implementation	2013-10-30 00:38:25 +01:00
RestDocumentHandler.cpp	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding	2014-02-06 13:18:52 +01:00
RestDocumentHandler.h	Add getAllDocumentsOnCoordinator and fix bugs.	2014-01-31 01:02:51 +01:00
RestEdgeHandler.cpp	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding	2014-02-06 13:18:52 +01:00
RestEdgeHandler.h	Start support for create edge in coordinator in cluster.	2014-01-24 16:47:29 +01:00
RestImportHandler.cpp	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding	2014-01-30 19:40:21 +01:00
RestImportHandler.h	added `details` URL parameter for `/_api/import`	2013-10-08 01:34:16 +02:00
RestReplicationHandler.cpp	added --server.ssl-protocol option for client tools	2013-12-13 17:58:24 +01:00
RestReplicationHandler.h	some minor adjustments for arangodump and arangorestore	2013-12-13 11:54:00 +01:00
RestUploadHandler.cpp	removed second logger implementation	2013-10-30 00:38:25 +01:00
RestUploadHandler.h	fixed queue naming	2013-09-20 13:17:32 +02:00
RestVocbaseBaseHandler.cpp	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding	2014-02-06 13:18:52 +01:00
RestVocbaseBaseHandler.h	Sort out mess with collection name/id lookup in cluster.	2014-01-30 17:27:06 +01:00