1
0
Fork 0
Commit Graph

209 Commits

Author SHA1 Message Date
Jan Steemann a70d4f2920 issue #137: exploit indexes for FILTER patterns collection.attribute operator collection.attribute 2012-08-06 12:56:11 +02:00
Jan Steemann 34441137df preparation work for issue #137 2012-08-06 10:34:56 +02:00
Jan Steemann 8326bb2abf preparation work for issue #137 2012-08-06 10:30:15 +02:00
Frank Celler 6ea7a4e626 added shutdown message in ps 2012-08-03 15:37:18 +02:00
Frank Celler b0e452f74a Merge branch 'master' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	CHANGELOG
	Makefile.am
	Makefile.in
	arangod/V8Server/v8-vocbase.cpp
2012-08-02 17:17:36 +02:00
Oreste Panaia b798b1d53f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	arangod/BitIndexes/bitarray.c
2012-08-02 15:28:49 +08:00
Oreste Panaia 03cce62c3a bitarray index now support explicit values 2012-08-02 15:20:43 +08:00
Jan Steemann 853d8fca8e fixed compile error with --enable-zeromq 2012-08-01 11:01:58 +02:00
Frank Celler 925dca60e7 added perl and node.js 2012-07-31 20:31:08 +02:00
Jan Steemann 590855f633 made BatchJob and BatchSubjob template classes, fixed unittests 2012-07-31 11:00:05 +02:00
Jan Steemann 5c24872306 moved endpoint option parsing into ApplicationEndpointServer class 2012-07-30 15:50:34 +02:00
Jan Steemann faf748ee7e fixed documentation after moving files/responsibilities 2012-07-30 15:05:34 +02:00
Jan Steemann 9d87988bf5 renamed ApplicationHttpServer to ApplicationEndpointServer 2012-07-30 08:26:16 +02:00
Frank Celler 05a6c4eb90 added datafile debugger doc 2012-07-29 13:06:33 +02:00
Frank Celler 325a4d59bb datafile check 2012-07-28 20:57:03 +02:00
Frank Celler 818b6d9ec2 datafile debugger 2012-07-28 09:32:45 +02:00
Jan Steemann 243aa0242c removed ApplicationHttpsServer 2012-07-27 15:59:58 +02:00
Jan Steemann 3b7b14454c added abstract EndpointServer, starting to combine ApplicationHttpServer and ApplicationHttpsServer 2012-07-27 15:38:27 +02:00
Jan Steemann c602be9ad2 added tests for ssl and unix socket endpoints 2012-07-27 10:47:03 +02:00
Jan Steemann eaeb9b42da completed documentation for ssl options 2012-07-26 15:09:26 +02:00
Jan Steemann daa6ca8b5e added documentation for ssl options 2012-07-26 13:39:21 +02:00
Jan Steemann 1f62715e87 fixed documentation 2012-07-26 12:49:25 +02:00
Jan Steemann eeeb78c2e7 Merge branch '1.1' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	CHANGELOG
	Installation/arangod.conf.in
	Makefile.in
	arangod/Makefile.files
	arangod/RestHandler/RestBatchHandler.cpp
	arangod/RestHandler/RestBatchHandler.h
	arangod/RestServer/ArangoServer.cpp
	bin/arango-password.in
2012-07-26 12:03:03 +02:00
Jan Steemann 7036501641 added documentation 2012-07-26 09:49:59 +02:00
Jan Steemann cc81db31a8 doxygen fixes 2012-07-26 09:46:22 +02:00
Jan Steemann cc9952f460 fixed documentation 2012-07-26 09:22:52 +02:00
Jan Steemann 7a0e9d350d added documentation for endpoints, disable-authentication, fixed tests 2012-07-26 09:10:59 +02:00
Jan Steemann 4f2229124f added --server.disable-authentication option 2012-07-26 08:49:56 +02:00
Frank Celler b2a334a063 added datafile map for collection 2012-07-25 20:56:34 +02:00
Jan Steemann c99dcc6357 fixed a doxygen error 2012-07-25 17:57:10 +02:00
Jan Steemann ae47eb4da8 added documentation 2012-07-25 17:52:21 +02:00
Jan Steemann 8d8044ba47 added proper SSL support for arangosh and arangoimp 2012-07-25 17:47:54 +02:00
Frank Celler 5aacb31226 removed TRI_IndexSimCollection (locking was broken for this function) 2012-07-25 16:47:50 +02:00
Frank Celler 97ff940736 fixed merge 2012-07-24 23:07:31 +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 537fb48aff allow admin interface via HTTPS 2012-07-24 09:48:13 +02:00
Oreste Panaia 53e4fb7f12 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	arangod/BitIndexes/bitarray.c
	arangod/BitIndexes/bitarrayIndex.c
2012-07-24 14:56:04 +08:00
Jan Steemann a8cf75b245 minor cleanup 2012-07-24 08:43:38 +02:00
Jan Steemann a910971b15 fixed documentation & installation settings after endpoint introduction 2012-07-24 08:42:45 +02:00
Oreste Panaia cd5ed3ac67 added http support for bitarray idnex creation 2012-07-24 14:30:38 +08:00
Jan Steemann 33839809ab ssl 2012-07-23 18:17:45 +02:00
Jan Steemann 9a72ea4496 added https@ and http@ endpoints, https still unfinished 2012-07-23 17:32:59 +02:00
Jan Steemann abc516f429 removed dead member variable 2012-07-23 16:00:12 +02:00
Jan Steemann c079eda53b fixed doxygen errors 2012-07-23 15:24:53 +02:00
Jan Steemann 4e6c8024f6 added support for unix sockets, switched connection strings to endpoint syntax 2012-07-23 13:54:35 +02:00
Jan Steemann 53e8581b99 added ifdef around zeromq stuff 2012-07-20 15:07:53 +02:00
Jan Steemann 8cfba96f28 removed option --server.admin-port 2012-07-20 15:05:18 +02:00
Jan Steemann dc91c9fcac fixed clang warnings 2012-07-20 13:06:51 +02:00
Jan Steemann 0dd0245ac4 fixed clang compile warnings and errors 2012-07-20 13:00:28 +02:00