1
0
Fork 0
arangodb/arangod
Frank Celler 69a8e64f9b Merge branch 'master' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	.gitignore
	Makefile.in
	Makefile.local
	Makefile.unittests
2012-08-09 15:25:29 +02:00
..
Actions the great Scheduler & Dispatcher refactoring 2012-06-30 23:52:49 +02:00
Ahuacatl issue #137: AQL optimizer should use indexes for ref accesses with 2 named attributes 2012-08-06 13:08:45 +02:00
BitIndexes Merge branch 'master' of github.com:triAGENS/ArangoDB into devel 2012-08-09 15:25:29 +02:00
Documentation Merge branch 'master' of github.com:triAGENS/ArangoDB into devel 2012-08-09 15:25:29 +02:00
GeoIndex issue #145: added epsilon 2012-08-09 15:06:22 +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-09 15:25:29 +02:00
SkipLists unified capitalization of todo markers 2012-08-07 10:02:55 +02: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-09 15:25:29 +02:00
Makefile.files made BatchJob and BatchSubjob template classes, fixed unittests 2012-07-31 11:00:05 +02:00