1
0
Fork 0
Commit Graph

640 Commits

Author SHA1 Message Date
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
Frank Celler 325a4d59bb datafile check 2012-07-28 20:57:03 +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 7a0e9d350d added documentation for endpoints, disable-authentication, fixed tests 2012-07-26 09:10:59 +02:00
Frank Celler b2a334a063 added datafile map for collection 2012-07-25 20:56:34 +02:00
Jan Steemann 435a01b6b3 added authorization for arangosh and arangoimp 2012-07-25 19:49:52 +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
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
Oreste Panaia cd5ed3ac67 added http support for bitarray idnex creation 2012-07-24 14:30:38 +08:00
Jan Steemann f00d11f9ae added macro TRI_TIMER_DUMP 2012-07-18 08:40:20 +02:00
Frank Celler a02faec3a3 added basic authentication 2012-07-15 17:06:59 +02:00
Frank Celler 17cf74b080 fixed issue #88: fds not closed 2012-07-11 15:18:12 +02:00
Frank Celler 191b1338fe issue #98: Unable to change journalSize 2012-07-11 13:42:17 +02:00
Frank Celler 24ead07956 clearified documentation, fixed paths for binary 2012-07-11 11:25:18 +02:00
Frank Celler 5ffff9edc4 added process title for supervisor 2012-07-11 10:46:04 +02:00
Frank Celler de187b1625 added wake-up call for synchroniser 2012-07-10 15:06:34 +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 bba14bbff3 added timing functions 2012-07-05 15:01:07 +02:00
Jan Steemann c353846e52 replaced 1-byte-at-a-time algorithm with 8-bytes-at-a-time algorithm for CRC32 block calculation 2012-07-05 12:13:11 +02:00
Jan Steemann 829acdcbe9 some speedups for JSON parsing, correction of Unicode escape sequence handling 2012-07-05 09:31:56 +02:00
Frank Celler 84903ace48 added log option 2012-07-04 23:02:45 +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
Oreste Panaia a9f9c3af55 trying to upload bitarrays 2012-06-27 14:21:21 +08:00
Oreste Panaia 43309908ec Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	arangod/BitIndexes/bitarray.c
	arangod/RestServer/ArangoServer.cpp
	configure
2012-06-26 20:41:04 +08:00
Oreste Panaia 20bbdab435 Bitarray index first draft 2012-06-26 20:05:49 +08:00
Jan Steemann 27da220b4f issue #72: fixed memleak for cap constraints 2012-06-25 10:03:15 +02:00
Jan Steemann c9b379f879 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-06-22 11:38:07 +02:00
Jan Steemann 92e73b1bb8 issue #112: do not accept document with duplicate attribute names 2012-06-22 11:36:48 +02:00
Frank Celler fffd1c4fc0 added log.filter 2012-06-19 17:30:08 +02:00
Frank Celler a3dae7083b ZeroMQ batch job and threads 2012-06-19 12:01:05 +02:00
Frank Celler 704f921d0f new HttpRequest 2012-06-14 15:03:17 +02:00
Frank Celler 02e8d7382f trying to get an abstact class for HttpRequest 2012-06-13 23:29:27 +02:00
Frank Celler 54826adb83 cleanup HttpRequest as prep for ZeroMQ 2012-06-13 21:51:27 +02:00
Frank Celler 2e7a9926f3 start with a larger initial buffer 2012-06-13 15:06:15 +02:00
Frank Celler 3f5b54258b partial ZeroMQ integration 2012-06-13 11:39:00 +02:00
Frank Celler 73e50d932f added name for pthreads 2012-06-13 00:12:45 +02:00
Frank Celler 57353e1e79 the great rename III 2012-06-08 15:21:31 +02:00
Frank Celler d2c758d663 the great rename 2012-06-08 15:01:25 +02:00