1
0
Fork 0
arangodb/lib/Rest
Max Neunhoeffer f7e57a5b47 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	js/apps/system/aardvark/frontend/scss/generated.css
	js/apps/system/aardvark/manifest.json
	lib/Rest/EndpointIp.cpp
	lib/Rest/EndpointUnixDomain.cpp
	lib/V8/v8-utils.cpp
2014-02-21 15:28:21 +01:00
..
AnyServer.cpp merged changes from 1.4 back to devel 2013-12-27 14:59:23 +01:00
AnyServer.h added service functions 2013-12-22 00:48:31 +01:00
AsyncJobServer.h updated disclaimer 2013-03-13 17:03:18 +01:00
ConnectionInfo.h added option `--server.disable-authentication-unix-sockets` 2014-02-02 00:22:07 +01:00
Endpoint.cpp Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-21 15:28:21 +01:00
Endpoint.h moved options --server.reuse-address and --server.no-reuse-address into ApplicationEndpointServer 2014-02-21 14:44:18 +01:00
EndpointIp.cpp Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-21 15:28:21 +01:00
EndpointIp.h moved options --server.reuse-address and --server.no-reuse-address into ApplicationEndpointServer 2014-02-21 14:44:18 +01:00
EndpointIpV4.cpp moved options --server.reuse-address and --server.no-reuse-address into ApplicationEndpointServer 2014-02-21 14:44:18 +01:00
EndpointIpV4.h moved options --server.reuse-address and --server.no-reuse-address into ApplicationEndpointServer 2014-02-21 14:44:18 +01:00
EndpointIpV6.cpp moved options --server.reuse-address and --server.no-reuse-address into ApplicationEndpointServer 2014-02-21 14:44:18 +01:00
EndpointIpV6.h moved options --server.reuse-address and --server.no-reuse-address into ApplicationEndpointServer 2014-02-21 14:44:18 +01:00
EndpointList.cpp moved options --server.reuse-address and --server.no-reuse-address into ApplicationEndpointServer 2014-02-21 14:44:18 +01:00
EndpointList.h moved options --server.reuse-address and --server.no-reuse-address into ApplicationEndpointServer 2014-02-21 14:44:18 +01:00
EndpointUnixDomain.cpp Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-21 15:28:21 +01:00
EndpointUnixDomain.h runtime addition and removal of endpoints 2013-09-12 18:07:39 +02:00
Handler.cpp fixed queue naming 2013-09-20 13:17:32 +02:00
Handler.h added dispatcher to shardhandler 2013-12-12 16:42:25 +01:00
HttpRequest.cpp splitted a few tests 2014-02-05 15:15:51 +01:00
HttpRequest.h for Michael... 2014-01-07 16:46:18 +01:00
HttpResponse.cpp removed second logger implementation 2013-10-30 00:38:25 +01:00
HttpResponse.h fixed some Windows warnings 2013-10-08 12:39:47 +02:00
InitialiseRest.cpp removed second logger implementation 2013-10-30 00:38:25 +01:00
InitialiseRest.h updated disclaimer 2013-03-13 17:03:18 +01:00
MaintenanceCallback.h updated disclaimer 2013-03-13 17:03:18 +01:00
OperationMode.h start up the HTTP server when starting ArangoDB in console mode 2014-01-27 09:45:26 +01:00
RequestContext.h refactoring of multiple databases, intermediate commit 2013-09-11 11:42:34 +02:00
RequestUser.h several errors fixed 2013-09-26 09:44:50 +02:00
SslInterface.cpp fix some VS warnings 2013-10-09 14:05:36 +02:00
SslInterface.h updated disclaimer 2013-03-13 17:03:18 +01:00
Url.cpp updated disclaimer 2013-03-13 17:03:18 +01:00
Url.h updated disclaimer 2013-03-13 17:03:18 +01:00
Version.cpp removed second logger implementation 2013-10-30 00:38:25 +01:00
Version.h issue #620 2013-10-28 19:38:19 +01:00