1
0
Fork 0
Commit Graph

210 Commits

Author SHA1 Message Date
Frank Celler 4e6f4a74a6 fixed memory leaks 2012-06-22 13:38:55 +02:00
Frank Celler 37d3ad8dc2 Merge branch 'devel' of github.com:triAGENS/ArangoDB
Conflicts:
	Makefile.in
	arangod/RestServer/ArangoServer.cpp
	arangod/RestServer/JavascriptDispatcherThread.cpp
	lib/Dispatcher/DispatcherQueue.cpp
	lib/HttpServer/HttpCommTask.cpp
2012-06-21 23:17:48 +02:00
Jan Steemann 074d0538e9 removed bogus FIXME comments 2012-06-21 16:46:57 +02:00
Jan Steemann f100e2ad82 changed async task handling 2012-06-21 16:32:54 +02:00
Frank Celler 3fc8118904 cleanup ApplicationFeature 2012-06-20 20:52:15 +02:00
Frank Celler 0e7d6f8f2a added prepare and open 2012-06-19 23:20:33 +02:00
Frank Celler 704f921d0f new HttpRequest 2012-06-14 15:03:17 +02:00
Frank Celler a92cd9ffd2 preparations for ZeroMQ, removed Scheduler and Dispatcher from ApplicationServer 2012-06-12 17:10:49 +02:00
Frank Celler 55ebf00dbd Merge branch 'devel' of github.com:triAGENS/ArangoDB
Conflicts:
	Actions/RestActionHandler.cpp
	Actions/RestActionHandler.h
	Makefile.files
	Makefile.in
	RestHandler/RestActionHandler.cpp
	RestHandler/RestActionHandler.h
	RestServer/ActionDispatcherThread.cpp
	RestServer/ActionDispatcherThread.h
	RestServer/RubyDispatcherThread.cpp
	RestServer/RubyDispatcherThread.h
	arangod/RestHandler/RestActionHandler.cpp
	arangod/RestHandler/RestActionHandler.h
	arangod/RestServer/ActionDispatcherThread.cpp
	arangod/RestServer/ActionDispatcherThread.h
	arangod/RestServer/ArangoServer.cpp
2012-06-08 15:57:33 +02:00
Frank Celler d2c758d663 the great rename 2012-06-08 15:01:25 +02:00