a-brandt
|
1c0578c2b5
|
Merge branch 'devel' into multiple_databases
Conflicts:
arangod/RestServer/ArangoServer.cpp
arangod/VocBase/vocbase.c
lib/HttpServer/ApplicationEndpointServer.cpp
lib/HttpServer/ApplicationEndpointServer.h
lib/HttpServer/HttpCommTask.h
lib/HttpServer/HttpHandlerFactory.cpp
lib/HttpServer/HttpHandlerFactory.h
lib/Rest/HttpRequest.cpp
lib/Rest/HttpRequest.h
|
2013-06-03 17:05:01 +02:00 |
Frank Celler
|
1aa5109fa3
|
updated disclaimer
|
2013-03-13 17:03:18 +01:00 |
|
Frank Celler
|
53364b7f15
|
updated error codes
|
2013-01-03 16:31:55 +01: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
|
d2c758d663
|
the great rename
|
2012-06-08 15:01:25 +02:00 |