James 6bbbc34150 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 ... Conflicts: arangod/Aql/ExecutionNode.h		2014-08-15 13:54:50 +02:00
..
Actions	new upgrade-database (formely known as version-check) and new startup procedure	2014-08-07 14:12:19 +02:00
Ahuacatl	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2	2014-08-13 16:29:57 +02:00
Aql	Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2	2014-08-15 13:54:50 +02:00
BitIndexes	…
CapConstraint	…
Cluster	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2	2014-08-13 16:29:57 +02:00
FulltextIndex	cxx	2014-07-03 22:50:37 +02:00
GeoIndex	…
HashIndex	…
IndexIterators	…
IndexOperators	…
Replication	Fix replication bug (no collection lock for single document transactions).	2014-07-16 13:03:06 +02:00
RestHandler	Sort out TRI_CompareValuesJson to use UTF8 on demand.	2014-08-13 14:22:05 +02:00
RestServer	new upgrade-database (formely known as version-check) and new startup procedure	2014-08-07 14:12:19 +02:00
SkipLists	Use two shapers in TRI_CompareShapeTypes	2014-08-07 09:51:24 +02:00
Utils	count number of documents in collection	2014-08-14 13:53:21 +02:00
V8Server	fixed types	2014-08-14 17:29:58 +02:00
VocBase	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2	2014-08-13 16:29:57 +02:00
Wal	updated documentation	2014-07-23 15:23:52 +02:00
CMakeLists.txt	Create infrastructure for the query optimizer.	2014-08-14 11:16:21 +02:00
Makefile.files	Create infrastructure for the query optimizer.	2014-08-14 11:16:21 +02:00