Jan Steemann 44a5db257d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel		2014-12-12 23:02:42 +01:00
..
Actions	…
Aql	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel	2014-12-12 23:02:42 +01:00
CapConstraint	…
Cluster	Renamed mergeArrays->mergeObjects to make API less confusing.	2014-12-02 17:03:03 +01:00
FulltextIndex	…
GeoIndex	…
HashIndex	allow lazier querying of hash index	2014-11-18 14:16:36 +01:00
IndexOperators	…
Replication	include or exclude system collections from replication	2014-12-05 14:58:43 +01:00
RestHandler	Add 'mergeObjects' description to edge API docs.	2014-12-10 23:24:32 +01:00
RestServer	…
SkipLists	…
Utils	removed debug output	2014-12-04 11:15:45 +01:00
V8Server	nullptr	2014-12-09 16:27:14 +01:00
VocBase	Fix a comment.	2014-12-08 16:12:40 +01:00
Wal	more log output	2014-11-14 15:30:43 +01:00
CMakeLists.txt	…
Makefile.files	…