1
0
Fork 0
Commit Graph

20 Commits

Author SHA1 Message Date
Frank Celler 49b19e4657 Merge branch 'devel' of github.com:triAGENS/ArangoDB
Conflicts:
	lib/BasicsC/terminal-utils-posix.c
	lib/BasicsC/terminal-utils.c
	lib/SimpleHttpClient/SimpleHttpResult.cpp
2012-09-12 23:49:14 +02:00
Frank Celler e8089d86a7 removed user manager 2012-09-12 23:37:39 +02:00
Jan Steemann f8deb40580 issue #193: REST API HEAD request returns a message body on 404 2012-09-11 00:11:26 +02:00
Jan Steemann b36776efb3 issue #110: add PATCH method for documents 2012-08-20 19:16:45 +02:00
Jan Steemann 4b16882b44 issue #131: make keep alive timeout configurable 2012-08-20 15:42:11 +02:00
Jan Steemann 2d480a4350 added binary servers 2012-07-30 15:33:19 +02:00
Jan Steemann 7af489934e some refactoring of http and https servers 2012-07-30 14:07:59 +02:00
Jan Steemann 570e0a5189 virtual 2012-07-27 11:41:37 +02:00
Frank Celler 935926bd8b added statistics 2012-07-03 16:34:49 +02:00
Frank Celler d0459a0851 new HttpServer & co implementation 2012-07-01 11:17:16 +02:00
Frank Celler fb4a7618e4 the great Scheduler & Dispatcher refactoring 2012-06-30 23:52:49 +02:00
Frank Celler f35a0dc67f Merge branch 'master' of github.com:fceller/ArangoDB into devel
Conflicts:
	lib/HttpServer/HttpHandler.cpp
2012-06-26 23:23:33 +02:00
Jan Steemann aa282cfcf9 some cleanup to reduce diff size 2012-06-26 17:25:25 +02:00
Jan Steemann af73c747a3 some cleanup to reduce diff size 2012-06-26 17:18:40 +02:00
Frank Celler 6d21cbc1c3 removed duplicate includes 2012-06-26 12:07:54 +02:00
Jan Steemann c858d39adc issue #115 2012-06-26 11:17:29 +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 3fc8118904 cleanup ApplicationFeature 2012-06-20 20:52:15 +02:00
Frank Celler d2c758d663 the great rename 2012-06-08 15:01:25 +02:00