1
0
Fork 0
arangodb/arangod
Jan Steemann a014b44ba4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2
Conflicts:
	arangod/Utils/Transaction.h
2014-08-28 11:06:14 +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-28 09:36:55 +02:00
BitIndexes updated disclaimer 2014-06-20 16:40:35 +02:00
CapConstraint recovery and replication 2014-06-30 13:07:48 +02:00
Cluster Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-27 19:25:37 +02:00
FulltextIndex cppcheck 2014-08-22 12:51:26 +02:00
GeoIndex updated disclaimer 2014-06-20 16:40:35 +02:00
HashIndex fill secondary indexes after recovery only 2014-06-29 00:18:21 +02:00
IndexIterators updated disclaimer 2014-06-20 16:40:35 +02:00
IndexOperators Add an explanation of index operators. 2014-08-27 12:10:51 +02:00
Replication removed unused function argument 2014-08-23 00:50:37 +02:00
RestHandler removed unused function argument 2014-08-23 00:50:37 +02:00
RestServer Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-22 21:51:38 +02:00
SkipLists Use two shapers in TRI_CompareShapeTypes 2014-08-07 09:51:24 +02:00
Utils Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-28 11:06:14 +02:00
V8Server Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-28 11:06:14 +02:00
VocBase added comments 2014-08-27 11:34:37 +02:00
Wal cppcheck 2014-08-22 12:51:26 +02:00
CMakeLists.txt basic C++ implementations for dedicated AQL functions 2014-08-28 01:24:42 +02:00
Makefile.files basic C++ implementations for dedicated AQL functions 2014-08-28 01:24:42 +02:00