1
0
Fork 0
arangodb/lib/Dispatcher
Frank Celler b01d9d77e7 Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/ApplicationV8.h
	arangod/V8Server/v8-actions.cpp
	js/apps/system/aardvark/frontend/js/bootstrap/module-internal.js
	js/apps/system/aardvark/frontend/scss/generated.css
	js/server/version-check.js
	lib/Dispatcher/Job.h
	lib/GeneralServer/GeneralServerJob.h
2014-02-20 21:02:07 +01:00
..
ApplicationDispatcher.cpp removed second logger implementation 2013-10-30 00:38:25 +01:00
ApplicationDispatcher.h updated documentation 2013-09-24 18:22:38 +02:00
Dispatcher.cpp removed second logger implementation 2013-10-30 00:38:25 +01:00
Dispatcher.h updated documentation 2013-09-24 18:22:38 +02:00
DispatcherQueue.cpp removed second logger implementation 2013-10-30 00:38:25 +01:00
DispatcherQueue.h updated documentation 2013-09-24 18:22:38 +02:00
DispatcherThread.cpp removed second logger implementation 2013-10-30 00:38:25 +01:00
DispatcherThread.h updated disclaimer 2013-03-13 17:03:18 +01:00
Job.cpp removed unused file 2014-01-16 14:53:35 +01:00
Job.h Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 2014-02-20 21:02:07 +01:00