1
0
Fork 0
arangodb/arangod
Frank Celler 939c5ece15 Merge branch '1.0' of github.com:triAGENS/ArangoDB
Conflicts:
	CHANGELOG
	CONTRIBUTING.md
	Doxygen/arango-html.doxy
	Doxygen/arango-latex.doxy
	Doxygen/arango-xml.doxy
	Doxygen/arango.template
	Makefile.in
	Makefile.local
	Makefile.unittests
	VERSION
	config/config.sub
	configure
	configure.ac
	js/actions/system/api-system.js
	js/client/js-client.h
	js/common/bootstrap/js-modules.h
	js/server/js-ahuacatl.h
	packetize.sh
2012-10-11 15:19:44 +02:00
..
Actions wrapper for memory mapped files add 2012-10-05 18:31:13 +08:00
Ahuacatl Merge branch '1.0' of github.com:triAGENS/ArangoDB 2012-10-11 15:19:44 +02:00
BitIndexes if 0'lled unused functions 2012-09-17 17:04:39 +02:00
Documentation Merge branch '1.0' of github.com:triAGENS/ArangoDB 2012-10-11 15:19:44 +02:00
GeoIndex fixed some memory zone issues 2012-10-10 15:17:46 +02:00
HashIndex renamed document collection to primary collection 2012-09-14 10:19:41 +02:00
IndexIterators Bitarray indexes update 2012-07-05 13:59:26 +08:00
IndexOperators draft index interface 2012-09-03 17:05:39 +08:00
MRServer merged with 1.0 2012-09-21 10:10:34 +02:00
PriorityQueue renamed document collection to primary collection 2012-09-14 10:19:41 +02:00
RestHandler fixed typos in documentation 2012-10-10 18:34:02 +02:00
RestServer fixed memory zone issues, memleaks 2012-10-10 19:05:16 +02:00
SkipLists ICU changes 2012-09-24 11:40:06 +02:00
Utils renamed simple_collection to document_collection 2012-09-14 14:46:37 +02:00
V8Server fixed memory zone issues, memleaks 2012-10-10 19:05:16 +02:00
VocBase fixed memory zone issues, memleaks 2012-10-10 19:05:16 +02:00
Makefile.files move edge-related functionality to file of its own 2012-10-10 11:42:52 +02:00