1
0
Fork 0
arangodb/arangod
Jan Steemann 9e47f3ca27 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	arangod/Aql/ExecutionNode.h
2014-09-26 20:23:52 +02:00
..
Actions
Ahuacatl
Aql Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-09-26 20:23:52 +02:00
CapConstraint
Cluster added block instanciation for coordinator, v0.0.0 2014-09-26 20:17:42 +02:00
FulltextIndex
GeoIndex
HashIndex
IndexOperators
Replication changed interface for locking 2014-09-22 09:25:49 +02:00
RestHandler Implement getSome for RemoteBlock. 2014-09-26 16:19:25 +02:00
RestServer More HTTP methods for queries. Expire queries. 2014-09-24 16:51:35 +02:00
SkipLists
Utils Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-09-24 16:17:44 +02:00
V8Server added block instanciation for coordinator, v0.0.0 2014-09-26 20:17:42 +02:00
VocBase fixed compile warnings 2014-09-26 12:30:42 +02:00
Wal
CMakeLists.txt merged experimental features 2014-09-24 09:42:16 +02:00
Makefile.files merged experimental features 2014-09-24 09:42:16 +02:00