1
0
Fork 0
Commit Graph

161 Commits

Author SHA1 Message Date
Jan Steemann f74da805ec fixed typo in option names 2013-02-25 09:17:36 +01:00
Jan Steemann 81f79315d1 removed configure option --enable-zone-debug 2013-02-22 15:54:14 +01:00
Oreste Panaia 9e69106c90 Merge branch '1.2' of https://github.com/triAGENS/ArangoDB into 1.2 2013-02-22 16:58:06 +08:00
Oreste Panaia ea601a23b3 Socket changes for windows libev 2013-02-22 16:51:13 +08:00
Frank Celler fe9f10af8d Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.2
Conflicts:
	CHANGELOG
	Documentation/Manual/arangodb_1.2_shell_reference_card.pdf
	Makefile.in
	aclocal.m4
	config/compile
	config/config.guess
	config/config.sub
	config/depcomp
	config/missing
	configure
	lib/JsonParser/json-parser.c
2013-02-21 14:21:59 +01:00
Frank Celler 2553b572ab fixed mode 2013-02-21 14:14:20 +01:00
Jan Steemann 53b41e7832 get rid of Valgrind warnings due to libev re-alloc behavior 2013-02-20 19:33:32 +01:00
Oreste Panaia 2c12f63d7f libev interface 2013-02-19 20:58:21 +08:00
Frank Celler 45c815b7eb fixed issue #403: Usage of exit() etc. 2013-02-15 12:19:09 +01:00
Frank Celler 069dcdfc94 changed logging of fatal errors 2013-02-14 16:47:35 +01:00
Frank Celler 7380ddfabe Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	arangosh/V8Client/arangosh.cpp
	bin/arango32.msi
	bin/arango64.msi
	lib/BasicsC/win-utils.c
2013-01-15 15:50:47 +01:00
Oreste Panaia 9baae9c129 windows bug fixes 2013-01-09 22:23:35 +08:00
Jan Steemann 876cda6ce1 cppcheck 2013-01-07 22:37:52 +01:00
Jan Steemann 8699262625 fixed compile warnings 2012-12-20 17:12:22 +01:00
Oreste Panaia 83ded3fc1f windows fixes 2012-12-20 17:17:30 +08:00
Oreste Panaia 857b66c490 windows version 2012-12-06 20:44:01 +08:00
Oreste Panaia 4d8d78e880 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	VisualStudio/Arango Front End Library/Arango Front End Library.vcxproj
	arangod/Actions/RestActionHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	lib/ApplicationServer/ApplicationServer.cpp
2012-10-22 21:04:12 +08:00
Oreste Panaia aad73db128 various changes for windows 2012-10-22 20:51:31 +08:00
Frank Celler e8093d68fe upgraded to Doxygen 1.8.x 2012-10-18 16:38:20 +02:00
Jan Steemann 6a7d1e57c7 issue #231: set request timeout for requests that come in incomplete 2012-10-15 21:34:28 +02:00
Jan Steemann 7449a529b3 cosmetics 2012-10-15 19:28:16 +02:00
Oreste Panaia aac17f7b55 wrapper for memory mapped files add 2012-10-05 18:31:13 +08:00
Oreste Panaia 8726b833d4 removed long static standard c++ string from header file 2012-09-28 21:52:28 +08:00
Oreste Panaia 6bdf3ae565 usual mysteries with git
Conflicts:
	lib/Rest/Endpoint.cpp
2012-09-28 17:56:05 +08:00
Oreste Panaia 2a71a3c371 minor changes for windows compatability 2012-09-28 17:34:22 +08:00
Jan Steemann 68ee67afd8 fixed SSL endless wait when data sent was bigger than readBuffer 2012-09-27 13:46:14 +02:00
Jan Steemann 5fa11516f3 fixed documentation and typos 2012-09-12 15:20:44 +02:00
Jan Steemann c973adc724 reduce log file spamming in case when running out of file descriptors 2012-09-05 16:56:07 +02:00
Jan Steemann 4b16882b44 issue #131: make keep alive timeout configurable 2012-08-20 15:42:11 +02:00
Jan Steemann 1278f6e8ea issue #131: added basic keep-alive timeout 2012-08-06 18:20:46 +02:00
Jan Steemann 496155fe7e fixed a typo 2012-08-06 15:56:39 +02:00
Frank Celler 6ea7a4e626 added shutdown message in ps 2012-08-03 15:37:18 +02:00
Jan Steemann 8d8044ba47 added proper SSL support for arangosh and arangoimp 2012-07-25 17:47:54 +02:00
Frank Celler 4605fbba9a Merge branch '1.1' of github.com:triAGENS/ArangoDB into 1.1
Conflicts:
	CHANGELOG
	Doxygen/Examples.ArangoDB/startup1
	Makefile.in
	arangod/Documentation/command-line-options.dox
	arangod/Documentation/install-manual.dox
	arangod/Makefile.files
	arangod/RestServer/ArangoServer.cpp
	arangod/VocBase/auth.h
	arangosh/V8Client/arangosh.cpp
	html/admin/css/layout.css
	lib/Basics/ssl-helper.h
	lib/HttpServer/ApplicationHttpServer.cpp
	lib/HttpServer/ApplicationHttpServer.h
	lib/HttpServer/HttpServer.cpp
	lib/HttpsServer/ApplicationHttpsServer.cpp
	lib/HttpsServer/ApplicationHttpsServer.h
2012-07-24 22:56:03 +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
Jan Steemann a40b1ed511 renamed classes 2012-07-23 15:58:08 +02:00
Jan Steemann 4e6c8024f6 added support for unix sockets, switched connection strings to endpoint syntax 2012-07-23 13:54:35 +02:00
Frank Celler 17cf74b080 fixed issue #88: fds not closed 2012-07-11 15:18:12 +02:00
Frank Celler 957bc347dc added connection statistics 2012-07-05 17:48:12 +02:00
Frank Celler c1892ff9b4 added doc for request statistics 2012-07-05 16:42:49 +02:00
Frank Celler 795b2a9178 added statistics 2012-07-04 18:33:13 +02:00
Frank Celler 935926bd8b added statistics 2012-07-03 16:34:49 +02:00
Frank Celler 7e153d21ef added TRI_USE_SPIN_LOCK_GENERAL_SERVER 2012-07-01 15:14:31 +02:00
Frank Celler 479cb7b8b8 fixed shutdown 2012-07-01 14:10:01 +02:00
Frank Celler fb4a7618e4 the great Scheduler & Dispatcher refactoring 2012-06-30 23:52:49 +02:00
Jan Steemann 3981974d1d working, but still blocking batch processing implementation 2012-06-27 09:53:37 +02:00
Jan Steemann 3f36f50baf whitespace etc. to reduce diff size 2012-06-26 16:50:04 +02:00
Frank Celler af60ebe612 fixed doc errors 2012-06-24 16:43:20 +02:00
Frank Celler 3a151b5bbd fixed memory leaks 2012-06-22 15:15:09 +02:00
Frank Celler 4e6f4a74a6 fixed memory leaks 2012-06-22 13:38:55 +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 8f16acdd86 added control to start & stop features 2012-06-19 22:12:49 +02:00
Frank Celler a3dae7083b ZeroMQ batch job and threads 2012-06-19 12:01:05 +02:00
Frank Celler f48ac96d34 added SPIN/MUTEX flag 2012-06-14 21:37:03 +02:00
Frank Celler ae2c588caa using spin locks 2012-06-13 15:01:17 +02:00
Frank Celler 1c2661df3c replaced Mutex by spin 2012-06-13 14:06:26 +02:00
Frank Celler b777deabd7 added /queued/version 2012-06-13 13:17:52 +02:00
Frank Celler 73e50d932f added name for pthreads 2012-06-13 00:12:45 +02:00
Frank Celler a92cd9ffd2 preparations for ZeroMQ, removed Scheduler and Dispatcher from ApplicationServer 2012-06-12 17:10:49 +02:00
Frank Celler d2c758d663 the great rename 2012-06-08 15:01:25 +02:00