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

10 Commits

Author SHA1 Message Date
Frank Celler b0e452f74a Merge branch 'master' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	CHANGELOG
	Makefile.am
	Makefile.in
	arangod/V8Server/v8-vocbase.cpp
 2012-08-02 17:17:36 +02:00
Jan Steemann cc81db31a8 doxygen fixes 2012-07-26 09:46:22 +02:00
Frank Celler 97ff940736 fixed merge 2012-07-24 23:07:31 +02:00
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
Frank Celler dc05fc3562 Amazon Micro Instance 2012-07-17 17:16:01 +02:00
Jan Steemann bf8b57ac2a fixed doxygen error 2012-07-10 17:08:07 +02:00
Frank Celler fb4a7618e4 the great Scheduler & Dispatcher refactoring 2012-06-30 23:52:49 +02:00
Frank Celler af60ebe612 fixed doc errors 2012-06-24 16:43:20 +02:00
Frank Celler 0e7d6f8f2a added prepare and open 2012-06-19 23:20:33 +02:00
Frank Celler d2c758d663 the great rename 2012-06-08 15:01:25 +02:00