1
0
Fork 0
Commit Graph

7 Commits

Author SHA1 Message Date
Frank Celler 35a3c6421c moved dispatcher to atomic 2015-07-23 15:40:34 +02:00
Jan Steemann 123a76089f removed JobType, special jobs and monopolizer 2015-07-21 14:07:53 +02:00
Jan Steemann a5db59cc47 remove some locks in HttpServer and friends 2015-07-17 17:48:45 +02:00
Jan Steemann ca6801d473 Merge branch 'devel' of https://github.com/arangodb/arangodb into cursor-refactoring 2015-03-31 15:13:41 +02:00
Jan Steemann 6dfb4d4b09 Merge branch 'devel' of https://github.com/arangodb/arangodb into cursor-refactoring
Conflicts:
	arangod/Aql/ExecutionBlock.cpp
	lib/HttpServer/HttpHandler.cpp
	lib/HttpServer/HttpServerJob.h
2015-03-31 15:13:31 +02:00
Jan Steemann 9706a3d6ac fixed Windows compile errors 2015-03-31 15:12:38 +02:00
Frank Celler ffbc45d2e2 new HttpServer & HttpCommTask
Conflicts:
	Makefile.in
	arangod/Aql/RestAqlHandler.cpp
	arangod/Aql/grammar.cpp
	arangod/Cluster/RestShardHandler.cpp
	lib/GeneralServer/GeneralServer.h
	lib/GeneralServer/GeneralServerDispatcher.h
	lib/HttpServer/HttpServerJob.h
	lib/HttpServer/HttpsCommTask.h
	lib/SimpleHttpClient/SslClientConnection.cpp
2015-03-31 09:12:01 +02:00