1
0
Fork 0
arangodb/arangod
Frank Celler aef20e2887 Merge branch 'master' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	Makefile.local
	arangod/Documentation/command-line-options.dox
	arangod/RestServer/ArangoServer.cpp
	build.sh
	html/admin/js/master.js
2012-08-05 22:46:55 +02:00
..
Actions the great Scheduler & Dispatcher refactoring 2012-06-30 23:52:49 +02:00
Ahuacatl fixed installation issures 2012-06-30 10:32:50 +02:00
BitIndexes Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-08-02 15:28:49 +08:00
Documentation Merge branch 'master' of github.com:triAGENS/ArangoDB into devel 2012-08-05 22:46:55 +02:00
GeoIndex the great rename 2012-06-08 15:01:25 +02:00
HashIndex added http support for bitarray idnex creation 2012-07-24 14:30:38 +08:00
IndexIterators Bitarray indexes update 2012-07-05 13:59:26 +08:00
IndexOperators Bitarray indexes update 2012-07-05 13:59:26 +08:00
MRServer Merge branch '1.0' of github.com:triAGENS/ArangoDB into 1.1 2012-07-24 22:19:46 +02:00
PriorityQueue added http support for bitarray idnex creation 2012-07-24 14:30:38 +08:00
RestHandler made BatchJob and BatchSubjob template classes, fixed unittests 2012-07-31 11:00:05 +02:00
RestServer Merge branch 'master' of github.com:triAGENS/ArangoDB into devel 2012-08-05 22:46:55 +02:00
SkipLists added http support for bitarray idnex creation 2012-07-24 14:30:38 +08:00
V8Server Merge branch 'master' of github.com:triAGENS/ArangoDB into devel 2012-08-02 17:17:36 +02:00
VocBase Merge branch 'master' of github.com:triAGENS/ArangoDB into devel 2012-08-02 17:17:36 +02:00
Makefile.files made BatchJob and BatchSubjob template classes, fixed unittests 2012-07-31 11:00:05 +02:00