1
0
Fork 0
Commit Graph

18 Commits

Author SHA1 Message Date
Jan Steemann 2e17f4bcd7 cppcheck 2014-05-09 00:21:17 +02:00
Frank Celler 8e9ad58f3b added cancelation of asnyc jobs
Conflicts:
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/v8-actions.cpp
	lib/Rest/Handler.h
2014-04-16 20:16:22 +02:00
Frank Celler 42fb8244e1 added requeue 2014-02-25 12:07:16 +01:00
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
Frank Celler 730da7623a added periodic tasks and statistics historian 2014-02-20 20:29:55 +01:00
Jan Steemann f0184d2786 not sure about the restshardhandler yet 2013-12-12 17:51:45 +01:00
Frank Celler 1aa5109fa3 updated disclaimer 2013-03-13 17:03:18 +01:00
Jan Steemann 10d6167d45 removed some unused compile options 2012-09-25 21:24:02 +02:00
Jan Steemann 2884125e09 added ifdef for zeromq define 2012-07-16 13:28:05 +02:00
Frank Celler 935926bd8b added statistics 2012-07-03 16:34:49 +02:00
Frank Celler fb4a7618e4 the great Scheduler & Dispatcher refactoring 2012-06-30 23:52:49 +02:00
Jan Steemann 75bd9acfba fixed some things in the batch handler 2012-06-27 15:19:09 +02:00
Jan Steemann af73c747a3 some cleanup to reduce diff size 2012-06-26 17:18:40 +02:00
Jan Steemann 3f36f50baf whitespace etc. to reduce diff size 2012-06-26 16:50:04 +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 f100e2ad82 changed async task handling 2012-06-21 16:32:54 +02:00
Frank Celler a3dae7083b ZeroMQ batch job and threads 2012-06-19 12:01:05 +02:00
Frank Celler d2c758d663 the great rename 2012-06-08 15:01:25 +02:00