1
0
Fork 0
Commit Graph

743 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
Frank Celler 818b6d9ec2 datafile debugger 2012-07-28 09:32:45 +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
Frank Celler 5aacb31226 removed TRI_IndexSimCollection (locking was broken for this function) 2012-07-25 16:47:50 +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 f126016484 added ExtractShapedJsonVocShaper 2012-07-16 15:42:41 +02:00
Frank Celler a02faec3a3 added basic authentication 2012-07-15 17:06:59 +02:00
Frank Celler b1aac93853 fixed warnings 2012-07-14 23:18:33 +02:00
Frank Celler 191b1338fe issue #98: Unable to change journalSize 2012-07-11 13:42:17 +02:00
Frank Celler e455348032 added --database.wait-for-sync 2012-07-10 16:34:06 +02:00
Frank Celler de187b1625 added wake-up call for synchroniser 2012-07-10 15:06:34 +02:00
Frank Celler 4c517c6d3c removed exec flag 2012-07-10 10:46:20 +02:00
Frank Celler 08ff930154 Merge branch 'devel' of github.com:triAGENS/ArangoDB 2012-07-09 14:24:38 +02:00
Frank Celler 1fe03464c2 Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.1 2012-07-05 15:42:12 +02:00
Oreste Panaia 67d6b7fca0 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-07-05 13:59:46 +08:00
Oreste Panaia c72f44c949 Bitarray indexes update 2012-07-05 13:59:26 +08:00
Jan Steemann ef01fa3c4e added OOM guard 2012-07-04 13:50:35 +02:00
Jan Steemann fe1ac7aebb issue #121: added more output to the figures() API call 2012-07-04 12:15:16 +02:00
Jan Steemann 570b47f649 honor option --database.maximal-journal-size 2012-07-03 17:09:35 +02:00
Frank Celler d3e2bca5ff Merge branch 'master' of github.com:fceller/ArangoDB into 1.1-stat 2012-07-02 18:47:33 +02:00
Frank Celler 237968ba26 cosmetics 2012-07-02 18:44:03 +02:00
Frank Celler 4e82d631c2 fixed memleak 2012-07-01 14:34:03 +02:00
Oreste Panaia 4ea30529ba Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-06-29 14:28:10 +08:00
Oreste Panaia 2e3b6531c8 Some fixes for bitarray indexes 2012-06-29 14:27:30 +08:00
Jan Steemann c4db88bdea fixed doxygen errors 2012-06-27 13:22:40 +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
Frank Celler 4e6f4a74a6 fixed memory leaks 2012-06-22 13:38:55 +02:00
Jan Steemann 0bb547b8f9 call UpdateTickVocbase() for both document and revision id 2012-06-22 12:45:08 +02:00
Jan Steemann 5a74e95f35 allow reusing ids and revision when creating collections and documents 2012-06-19 15:50:52 +02:00
Frank Celler 0c9683fb8d Merge branch 'devel' of github.com:triAGENS/ArangoDB
Conflicts:
	Makefile.in
2012-06-14 15:04:33 +02:00
Oreste Panaia 9949c9e75c renamed sl-operator.c and sl-operator.h to index-operator.c and index-operator.h respectively 2012-06-14 10:04:41 +08:00
Frank Celler 79449d5d71 Merge branch 'devel' of github.com:triAGENS/ArangoDB
Conflicts:
	arangod/Ahuacatl/ahuacatl-grammar.c
2012-06-13 11:40:35 +02:00
Frank Celler 73e50d932f added name for pthreads 2012-06-13 00:12:45 +02:00
Jan Steemann 4ec362fc8f some optimiser stuff 2012-06-12 09:36:58 +02:00
Jan Steemann efd48664ef Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	Ahuacatl/ahuacatl-statement-dump.c
	Ahuacatl/ahuacatl-statement-dump.h
	Ahuacatl/ahuacatl-statementlist.c
	Ahuacatl/ahuacatl-tree-dump.c
	Ahuacatl/ahuacatl-tree-dump.h
	Ahuacatl/ahuacatl-tree-walker.h
	Makefile.files
	Makefile.in
	arangod/Ahuacatl/ahuacatl-tree-dump.c
	arangod/Ahuacatl/ahuacatl-tree-dump.h
	arangod/Ahuacatl/ahuacatl-tree-walker.c
	arangod/Ahuacatl/ahuacatl-tree-walker.h
2012-06-08 17:34:20 +02:00
Frank Celler 313c3c31ed Merge branch '1.0' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangosh/V8Client/arangosh.cpp
2012-06-08 15:13:01 +02:00
Frank Celler d2c758d663 the great rename 2012-06-08 15:01:25 +02:00