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
|
9d9136595e
|
renamed option to javascript.unit-tests
|
2012-07-15 18:02:22 +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
|
9d36e4f6e8
|
fixed relative path
|
2012-06-13 13:39:21 +02:00 |
Frank Celler
|
55ebf00dbd
|
Merge branch 'devel' of github.com:triAGENS/ArangoDB
Conflicts:
Actions/RestActionHandler.cpp
Actions/RestActionHandler.h
Makefile.files
Makefile.in
RestHandler/RestActionHandler.cpp
RestHandler/RestActionHandler.h
RestServer/ActionDispatcherThread.cpp
RestServer/ActionDispatcherThread.h
RestServer/RubyDispatcherThread.cpp
RestServer/RubyDispatcherThread.h
arangod/RestHandler/RestActionHandler.cpp
arangod/RestHandler/RestActionHandler.h
arangod/RestServer/ActionDispatcherThread.cpp
arangod/RestServer/ActionDispatcherThread.h
arangod/RestServer/ArangoServer.cpp
|
2012-06-08 15:57:33 +02:00 |
Frank Celler
|
efcfbccc7a
|
the great rename IV
|
2012-06-08 15:25:16 +02:00 |
Frank Celler
|
313c3c31ed
|
Merge branch '1.0' of github.com:triAGENS/ArangoDB into devel
Conflicts:
arangod/RestServer/ArangoServer.cpp
arangosh/V8Client/arangosh.cpp
|
2012-06-08 15:13:01 +02:00 |
Frank Celler
|
d2c758d663
|
the great rename
|
2012-06-08 15:01:25 +02:00 |