Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
arangodb/arangod/MRServer
History
Frank Celler 041eb53b10 Merge branch '1.0' of github.com:triAGENS/ArangoDB into 1.1 
Conflicts:
	Makefile.in
	arangod/RestServer/ArangoServer.cpp
	arangoirb/MRClient/arangoirb.cpp
	lib/GeneralServer/GeneralServer.h
	lib/HttpServer/ApplicationHttpServer.cpp
	lib/HttpServer/HttpCommTask.cpp
	lib/HttpServer/HttpHandler.cpp
	lib/HttpServer/HttpHandlerFactory.cpp
	lib/HttpServer/HttpHandlerFactory.h
	lib/HttpsServer/ApplicationHttpsServer.cpp
 		2012-07-24 22:19:46 +02:00
..
ApplicationMR.cpp Merge branch '1.0' of github.com:triAGENS/ArangoDB into 1.1 2012-07-24 22:19:46 +02:00
ApplicationMR.h yesterday 2012-07-02 18:47:12 +02:00
mr-actions.cpp yesterday 2012-07-02 18:47:12 +02:00
mr-actions.h yesterday 2012-07-02 18:47:12 +02:00