1
0
Fork 0
Commit Graph

59 Commits

Author SHA1 Message Date
Jan Steemann 8d8044ba47 added proper SSL support for arangosh and arangoimp 2012-07-25 17:47:54 +02:00
Frank Celler 4605fbba9a Merge branch '1.1' of github.com:triAGENS/ArangoDB into 1.1
Conflicts:
	CHANGELOG
	Doxygen/Examples.ArangoDB/startup1
	Makefile.in
	arangod/Documentation/command-line-options.dox
	arangod/Documentation/install-manual.dox
	arangod/Makefile.files
	arangod/RestServer/ArangoServer.cpp
	arangod/VocBase/auth.h
	arangosh/V8Client/arangosh.cpp
	html/admin/css/layout.css
	lib/Basics/ssl-helper.h
	lib/HttpServer/ApplicationHttpServer.cpp
	lib/HttpServer/ApplicationHttpServer.h
	lib/HttpServer/HttpServer.cpp
	lib/HttpsServer/ApplicationHttpsServer.cpp
	lib/HttpsServer/ApplicationHttpsServer.h
2012-07-24 22:56:03 +02:00
Jan Steemann 7ea8cff7c8 some connection refactoring 2012-07-24 18:42:31 +02:00
Jan Steemann a40b1ed511 renamed classes 2012-07-23 15:58:08 +02:00
Jan Steemann dca96749ff default value cleanup 2012-07-23 15:39:52 +02:00
Jan Steemann 4e6c8024f6 added support for unix sockets, switched connection strings to endpoint syntax 2012-07-23 13:54:35 +02:00
Frank Celler 5ffff9edc4 added process title for supervisor 2012-07-11 10:46:04 +02:00
Jan Steemann 5a74e95f35 allow reusing ids and revision when creating collections and documents 2012-06-19 15:50:52 +02:00
Frank Celler d2c758d663 the great rename 2012-06-08 15:01:25 +02:00