Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
3,430 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

4 Commits

Author SHA1 Message Date
a-brandt c2d0749178 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangod/RestHandler/RestDocumentHandler.cpp
	arangod/RestHandler/RestEdgeHandler.cpp
	arangod/RestHandler/RestImportHandler.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/document-collection.c
	arangod/VocBase/document-collection.h
	arangod/VocBase/primary-collection.c
	arangod/VocBase/primary-collection.h
 2012-10-24 10:46:38 +02:00
a-brandt 9a599e468a added "_key" attribute 2012-10-23 15:58:09 +02:00
Jan Steemann a4b979222f fixed memory zone issues, memleaks 2012-10-10 19:05:16 +02:00
Jan Steemann c1ebdabcf3 renamed blob_collection to shape_collection 2012-09-04 09:32:18 +02:00