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
..
Actions	Cleanup conversion C++ <-> Javascript of HttpRequest/HttpResponse.	2014-01-06 11:40:49 +01:00
Ahuacatl	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding	2014-02-06 13:18:52 +01:00
BitIndexes	removed superfluous error codes	2013-11-22 13:49:05 +01:00
CapConstraint	Add the option to return numUsed for each index in getIndexes.	2013-11-13 12:49:23 +01:00
Cluster	fixed HTTP CRUD operations	2014-02-05 17:19:45 +01:00
FulltextIndex	fixed some VS complaints	2013-10-16 17:27:35 +02:00
GeoIndex	Merge remote-tracking branch 'origin/devel' into inline-shapes	2013-11-14 01:01:24 +01:00
HashIndex	removed superfluous error codes	2013-11-22 13:49:05 +01:00
IndexIterators	…
IndexOperators	removed resourceholder	2013-10-17 10:43:07 +02:00
MRServer	start up the HTTP server when starting ArangoDB in console mode	2014-01-27 09:45:26 +01:00
Replication	added --server.ssl-protocol option for client tools	2013-12-13 17:58:24 +01:00
RestHandler	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding	2014-02-06 13:18:52 +01:00
RestServer	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding	2014-02-06 13:18:52 +01:00
SkipLists	Fix a memory leak introduced by the skip list index cleanup.	2013-11-22 11:37:59 +01:00
Utils	splitted a few tests	2014-02-05 15:15:51 +01:00
V8Server	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding	2014-02-06 13:18:52 +01:00
VocBase	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding	2014-02-06 13:18:52 +01:00
CMakeLists.txt	windows fixes	2014-01-27 17:46:15 +01:00
Makefile.files	start up the HTTP server when starting ArangoDB in console mode	2014-01-27 09:45:26 +01:00