1
0
Fork 0
Commit Graph

56 Commits

Author SHA1 Message Date
Jan Steemann 587c2aef64 issue #744
Conflicts:
	lib/ApplicationServer/ApplicationServer.cpp
2014-01-23 09:58:18 +01:00
Frank Celler 8dbdf55165 Merge remote-tracking branch 'origin/1.4' into devel
Conflicts:
	CHANGELOG
	arangosh/ArangoShell/ArangoClient.cpp
2013-12-30 17:27:17 +01:00
Frank Celler 9928cd645f added local config 2013-12-30 17:20:39 +01:00
Frank Celler 84507cfc44 merged changes from 1.4 back to devel 2013-12-27 14:59:23 +01:00
Frank Celler 2651f7bae5 added TRI_LocateInstallDirectory and TRI_LocateConfigDirectory 2013-12-20 10:39:50 +01:00
Jan Steemann 3edd6a0251 issue #694: added tests for configuration files 2013-12-02 09:39:27 +01:00
Jan Steemann 4f50b98c45 removed second logger implementation 2013-10-30 00:38:25 +01:00
Jan Steemann f498f8f03c faster server shutdown 2013-10-18 10:18:46 +02:00
Jan Steemann a3b35c613c config file handling 2013-10-09 17:00:06 +02:00
Jan Steemann 106fedd615 several errors fixed 2013-09-26 09:44:50 +02:00
Jan Steemann 97afd329ff updated documentation 2013-09-24 18:22:38 +02:00
Jan Steemann 860ed964c3 simplify build.h 2013-08-28 22:20:06 +02:00
Jan Steemann 7cb6b7d922 simplified build.h stuff 2013-08-28 19:57:07 +02:00
Jan Steemann 08f09a6bc7 do not flush log messages after initialisation 2013-08-27 13:26:00 +02:00
Jan Steemann 949c194653 updated replication configuration 2013-08-01 15:50:30 +02:00
Jan Steemann 002ebd48bc removed all replication conditionals 2013-07-30 13:16:37 +02:00
Jan Steemann d7561e70e1 added logging options 2013-07-02 12:16:13 +02:00
Jan Steemann 6e9c3e8e2c replication logging 2013-06-26 12:04:55 +02:00
Jan Steemann e1dae88f7b improved description for log.filter command line option 2013-04-19 12:05:49 +02:00
Frank Celler 8a54df7419 added .arangosh.rc, added /_admin/execute 2013-03-23 14:04:08 +01:00
Frank Celler 1aa5109fa3 updated disclaimer 2013-03-13 17:03:18 +01:00
Jan Steemann 0fb397eabd adjusted startup output to be more compact, less verbose 2013-03-06 19:05:17 +01:00
Oreste Panaia fc5e1ba623 merge conflicts with devel 2013-02-28 19:42:58 +08:00
Oreste Panaia a48696ec28 network modifications required for windows 2013-02-28 17:43:39 +08:00
Jan Steemann 74798c4fb1 more verbose option help texts 2013-02-25 09:20:20 +01:00
Frank Celler 45c815b7eb fixed issue #403: Usage of exit() etc. 2013-02-15 12:19:09 +01:00
Frank Celler e4d1c8a6bd partly fix for issue #333: [debian] Group arangodb is not used when starting vie init.d script 2013-02-15 11:50:05 +01:00
Frank Celler 069dcdfc94 changed logging of fatal errors 2013-02-14 16:47:35 +01:00
Jan Steemann 6085ef9619 fixed doxygen error, added comment 2013-01-02 13:40:47 +01:00
Oreste Panaia 83ded3fc1f windows fixes 2012-12-20 17:17:30 +08:00
Oreste Panaia 033adb225b Updated windows installer 2012-12-10 19:33:32 +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 f1eaaa7f04 fixed doc issue, doxygen sometimes does not recognize the used namespace 2012-10-16 17:34:54 +02:00
Oreste Panaia 0e835b90b2 windows 2012-10-08 23:29:29 +08:00
Jan Steemann 89754433dd switched to C mersenne twister implementation in BasicsC 2012-09-25 22:57:47 +02:00
Jan Steemann 4ad85e7037 added HttpResponsePart class 2012-09-24 16:59:19 +02:00
Jan Steemann 9bc99b7c9d renamed document collection to primary collection 2012-09-14 10:19:41 +02:00
Frank Celler 39f4a8f833 cleanup directory structure and init file handling
moved common functions to ArangoClient
2012-08-30 16:54:42 +02:00
Frank Celler 6ea7a4e626 added shutdown message in ps 2012-08-03 15:37:18 +02:00
Jan Steemann 3b7b14454c added abstract EndpointServer, starting to combine ApplicationHttpServer and ApplicationHttpsServer 2012-07-27 15:38:27 +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
Frank Celler 58d29a78ef fixed privileges 2012-07-10 18:27:50 +02:00
Frank Celler 1fe03464c2 Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.1 2012-07-05 15:42:12 +02:00
Jan Steemann d9227ac680 issue #122: arangod doesn't start if <log.file> cannot be created 2012-07-04 13:34:26 +02:00
Frank Celler 479cb7b8b8 fixed shutdown 2012-07-01 14:10:01 +02:00
Frank Celler 38b5c0f561 fixed shutdown order 2012-06-22 17:21:22 +02:00
Frank Celler b1a145c64a Merge branch 'master' of https://github.com/fceller/ArangoDB into devel 2012-06-22 11:03:40 +02:00
Frank Celler 6c55734753 added running check 2012-06-22 11:03:27 +02:00