1
0
Fork 0
arangodb/lib/GeneralServer
Frank Celler b01d9d77e7 Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/ApplicationV8.h
	arangod/V8Server/v8-actions.cpp
	js/apps/system/aardvark/frontend/js/bootstrap/module-internal.js
	js/apps/system/aardvark/frontend/scss/generated.css
	js/server/version-check.js
	lib/Dispatcher/Job.h
	lib/GeneralServer/GeneralServerJob.h
2014-02-20 21:02:07 +01:00
..
EndpointServer.h runtime addition and removal of endpoints 2013-09-12 18:07:39 +02:00
GeneralAsyncCommTask.h
GeneralCommTask.h Resolve socket bug under Windows. 2014-02-17 14:21:47 +01:00
GeneralListenTask.h removed unused private variable (fixes compiler warning) 2013-06-28 15:44:59 +02:00
GeneralServer.h improve error message 2013-10-30 14:38:20 +01:00
GeneralServerDispatcher.h added periodic tasks and statistics historian 2014-02-20 20:29:55 +01:00
GeneralServerJob.h Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 2014-02-20 21:02:07 +01:00
GeneralSslServer.h Resolve socket bug under Windows. 2014-02-17 14:21:47 +01:00
SpecificCommTask.h
SslAsyncCommTask.h added --server.ssl-protocol option for client tools 2013-12-13 17:58:24 +01:00