1
0
Fork 0
arangodb/UnitTests
Frank Celler 051705c7b9 Merge branch '1.1' of github.com:triAGENS/ArangoDB
Conflicts:
	.gitignore
	CHANGELOG
	Doxygen/Examples.ArangoDB/arangosh-options
	Doxygen/arango-html.doxy
	Doxygen/arango-latex.doxy
	Doxygen/arango-xml.doxy
	Doxygen/arango.template
	Makefile.in
	UnitTests/HttpInterface/api-collection-spec.rb
	VERSION
	arangod/Ahuacatl/ahuacatl-access-optimiser.c
	arangod/Documentation/first-steps-arangodb.dox
	arangod/Documentation/user-manual.dox
	arangod/HashIndex/compare.h
	arangod/HashIndex/hasharray.c
	arangod/HashIndex/hasharray.h
	arangod/HashIndex/hashindex.h
	arangod/V8Server/v8-actions.cpp
	arangod/VocBase/simple-collection.c
	arangosh/V8Client/V8ClientConnection.cpp
	arangosh/V8Client/V8ClientConnection.h
	arangosh/V8Client/arangoimp.cpp
	arangosh/V8Client/arangosh.cpp
	configure
	configure.ac
	html/admin/css/layout.css
	html/admin/index.html
	html/admin/js/master.js
	js/actions/system/api-system.js
	js/common/bootstrap/js-modules.h
	js/server/js-ahuacatl.h
	js/server/js-server.h
	js/server/server.js
	lib/BasicsC/voc-errors.c
	lib/V8/v8-globals.h
2012-12-05 12:34:08 +01:00
..
Cambridge issue #145: added epsilon 2012-08-09 15:06:22 +02:00
HttpInterface Merge branch '1.1' of github.com:triAGENS/ArangoDB 2012-12-05 12:34:08 +01:00
Jutland updates 2012-10-17 10:27:50 +02:00
Philadelphia fixed gcc compile warnings 2012-11-22 21:34:41 +01:00
Makefile.files replaced arango-upgrade script with server startup option --upgrade 2012-12-03 13:45:58 +01:00
Runner.cpp renamed to Arango 2012-05-12 14:40:34 +02:00
import-1.csv issue #178: added test cases for arangoimp 2012-08-31 13:31:16 +02:00
import-1.json issue #178: added test cases for arangoimp 2012-08-31 13:31:16 +02:00
import-1.tsv issue #204: allow import of tab-separated values 2012-09-30 01:38:32 +02:00
import-2.csv issue #178: added test cases for arangoimp 2012-08-31 13:31:16 +02:00
import-2.json issue #178: added test cases for arangoimp 2012-08-31 13:31:16 +02:00
import-2.tsv issue #204: allow import of tab-separated values 2012-09-30 01:38:32 +02:00
server.pem added tests for ssl and unix socket endpoints 2012-07-27 10:47:03 +02:00