Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
21,572 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

4 Commits

Author SHA1 Message Date
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