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

6 Commits

Author SHA1 Message Date
Frank Celler 249492a89c Merge remote-tracking branch 'origin/1.1' into devel 
Conflicts:
	CHANGELOG
	Documentation/Manual/GlossaryCollectionName.md
	Documentation/Manual/NewFeatures11.md
	Documentation/UserManual/FirstStepsArangoDB.md
	VERSION
	arangod/Documentation/api-blueprints.dox
	arangod/HashIndex/hasharray.c
	arangod/RestHandler/RestVocbaseBaseHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/v8-actions.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/compactor.c
	arangod/VocBase/document-collection.c
	configure.ac
	html/admin/js/master.js
	js/server/ahuacatl.js
	js/server/arango-upgrade.js
	lib/BasicsC/voc-errors.h
	lib/V8/V8LineEditor.cpp
	lib/V8/v8-utils.cpp
 2012-11-27 12:34:58 +01:00
Jan Steemann ad855bd2bd fixed doxygen errors 2012-11-21 18:10:45 +01:00
Jan Steemann fabf8b700b fixed documentation 2012-11-21 17:44:23 +01:00
a-brandt 7220ffafc5 blueprints api updates 2012-11-21 14:14:55 +01:00
a-brandt b800f2652c renamed "blueprint" to "blueprints" and added documentation and tests 2012-10-30 13:35:36 +01:00
a-brandt fff25d5ac3 renamed "blueprint" to "blueprints" and added documentation and tests 2012-10-30 12:29:51 +01:00