1
0
Fork 0
arangodb/arangod
Frank Celler b888e8cfa6 Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding
Conflicts:
	arangod/V8Server/V8PeriodicJob.cpp
	js/apps/system/aardvark/api-docs.json
	js/apps/system/aardvark/api-docs/batch.json
	js/apps/system/aardvark/api-docs/collection.json
	js/apps/system/aardvark/api-docs/cursor.json
	js/apps/system/aardvark/api-docs/database.json
	js/apps/system/aardvark/api-docs/document.json
	js/apps/system/aardvark/api-docs/edge.json
	js/apps/system/aardvark/api-docs/edges.json
	js/apps/system/aardvark/api-docs/endpoint.json
	js/apps/system/aardvark/api-docs/graph.json
	js/apps/system/aardvark/api-docs/index.json
	js/apps/system/aardvark/api-docs/job.json
	js/apps/system/aardvark/api-docs/replication.json
	js/apps/system/aardvark/api-docs/simple.json
	js/apps/system/aardvark/api-docs/system.json
	js/apps/system/aardvark/api-docs/traversal.json
2014-02-28 20:37:05 +01:00
..
Actions cleanup 2014-02-25 15:32:07 +01:00
Ahuacatl properly acquire shape write locks 2014-02-28 18:43:09 +01:00
BitIndexes fixed compiler warnings in bitarray implementation 2014-02-11 09:18:16 +01:00
CapConstraint use indexes in AQL 2014-02-28 13:50:39 +01:00
Cluster Give the server state in the agency a time to live. 2014-02-28 18:47:46 +01:00
FulltextIndex
GeoIndex use indexes in AQL 2014-02-28 13:50:39 +01:00
HashIndex use indexes in AQL 2014-02-28 13:50:39 +01:00
IndexIterators
IndexOperators properly acquire shape write locks 2014-02-28 18:43:09 +01:00
MRServer cleanup 2014-02-25 15:32:07 +01:00
Replication properly acquire shape write locks 2014-02-28 18:43:09 +01:00
RestHandler properly acquire shape write locks 2014-02-28 18:43:09 +01:00
RestServer Merge branch 'sharding' of github.com:triAGENS/ArangoDB into sharding 2014-02-28 12:03:11 +01:00
SkipLists properly acquire shape write locks 2014-02-28 18:43:09 +01:00
Utils properly acquire shape write locks 2014-02-28 18:43:09 +01:00
V8Server Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 2014-02-28 20:37:05 +01:00
VocBase include collection in inventory if id is equal to current server tick 2014-02-28 20:00:04 +01:00
CMakeLists.txt re-create database objects on coordinator now, and switch into them 2014-02-21 17:40:00 +01:00
Makefile.files re-create database objects on coordinator now, and switch into them 2014-02-21 17:40:00 +01:00