Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
6,673 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

1546 Commits

Author SHA1 Message Date
Oreste Panaia 81f20c7ba0 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-06-12 17:03:29 +08:00
a-brandt c9cb2a2008 deleted unused variable 2013-06-12 09:12:07 +02:00
a-brandt 8850add4e5 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-06-11 17:20:32 +02:00
a-brandt 3cc5843247 deleted _path 2013-06-11 17:16:04 +02:00
a-brandt 9d29619897 deleted function TRI_WrapVocBase 2013-06-11 11:17:55 +02:00
a-brandt d9fc2a6c60 Merge branch 'devel' into multiple_databases 
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/primary-collection.c
 2013-06-11 11:17:41 +02:00
a-brandt aadec76f8e Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-06-11 10:59:24 +02:00
a-brandt a3fad4484f added function JS_getIcuTimezones, JS_getIcuLocales and JS_formatDatetime 2013-06-11 10:59:13 +02:00
Jan Steemann e8e10844f4 moved compaction tests 2013-06-11 10:41:40 +02:00
Jan Steemann 564523896a compaction tests 2013-06-11 10:10:58 +02:00
Jan Steemann dc700fb186 use a write-lock when modifying file info in datafiles vector 2013-06-10 11:59:27 +02:00
Jan Steemann b65fecd880 fix reported datafile size for compacted files 2013-06-10 11:21:00 +02:00
Jan Steemann 8696048dbb removed now unnecessary _validTo from master pointers/headers 2013-06-10 11:20:19 +02:00
Oreste Panaia 35ab2e6f62 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-06-10 17:05:58 +08:00
Oreste Panaia 8e10a5e173 windows updates 2013-06-10 17:05:33 +08:00
Jan Steemann e3275136cd allow incremental access to all documents from a collection out of AQL 2013-06-07 16:51:42 +02:00
Jan Steemann 27d4c8c89d introduced compaction lock 2013-06-07 13:37:51 +02:00
Jan Steemann 40781d558b more error checking for halfway-created v8 objects 2013-06-07 11:39:21 +02:00
Jan Steemann ef19833ced fixed locking for truncate() 2013-06-07 11:34:48 +02:00
Jan Steemann 12f2e2e6a1 fixed type issue 2013-06-07 11:33:46 +02:00
Jan Steemann 4a8b4f5e73 pull shapedJson creation out of loop 2013-06-07 11:33:12 +02:00
Jan Steemann d31573a8b4 fixed a few type issues, updated TODOs 2013-06-07 11:31:42 +02:00
Jan Steemann f5d87e32c1 init variables 2013-06-06 20:28:21 +02:00
Jan Steemann 54b0552dee use a stable sort in COLLECT 2013-06-06 16:56:39 +02:00
a-brandt 9e0335a1bf Merge branch 'devel' into multiple_databases 2013-06-06 16:12:44 +02:00
Thomas Richter 638a0cb05f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-06-06 14:52:35 +02:00
Thomas Richter dc691ca6c2 examples generated in api-simple.js 2013-06-06 14:43:36 +02:00
a-brandt e4096900cc Merge branch 'devel' into multiple_databases 2013-06-06 12:54:58 +02:00
Jan Steemann e3cc4628bc removed unused define 2013-06-06 12:07:04 +02:00
a-brandt 1f519da089 added configuration option to start in multiple database mode 2013-06-06 09:35:42 +02:00
a-brandt 3827ad8f52 added a log message 2013-06-06 09:34:15 +02:00
a-brandt 793dc6077d Merge branch 'devel' into multiple_databases 2013-06-05 17:29:34 +02:00
a-brandt 967e45e103 added adding of enpoints and prefix to database mappings 2013-06-05 17:29:00 +02:00
Oreste Panaia 2afd8a742c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-06-05 19:53:25 +08:00
Oreste Panaia 8a95c1c2a8 update 2013-06-05 19:52:34 +08:00
Jan Steemann b94feca02c fixed documentation errors 2013-06-04 22:55:07 +02:00
Jan Steemann 5bdaa22049 issue #545 2013-06-04 18:31:16 +02:00
a-brandt 144c5ca634 bugfix wrong function call for mruby 2013-06-04 15:18:51 +02:00
a-brandt 0096f297ca added _endpoints and _prefix collection 2013-06-04 14:56:42 +02:00
a-brandt 68ac9a3adc bugfix wrong string length 2013-06-04 14:53:39 +02:00
a-brandt 384b3c283c Merge branch 'devel' into multiple_databases 2013-06-04 13:07:06 +02:00
a-brandt 21f9da2104 moved database version check to VocbaseManager 2013-06-04 13:05:06 +02:00
Jan Steemann c259f8ff4a fixed typo 2013-06-04 10:29:01 +02:00
a-brandt 1d255a9861 renamed a function 2013-06-03 17:42:21 +02:00
a-brandt 144af0c277 deleted old code 2013-06-03 17:38:11 +02:00
a-brandt aeec284400 Merge branch 'devel' into multiple_databases 2013-06-03 17:09:21 +02:00
a-brandt 1c0578c2b5 Merge branch 'devel' into multiple_databases 
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangod/VocBase/vocbase.c
	lib/HttpServer/ApplicationEndpointServer.cpp
	lib/HttpServer/ApplicationEndpointServer.h
	lib/HttpServer/HttpCommTask.h
	lib/HttpServer/HttpHandlerFactory.cpp
	lib/HttpServer/HttpHandlerFactory.h
	lib/Rest/HttpRequest.cpp
	lib/Rest/HttpRequest.h
 2013-06-03 17:05:01 +02:00
Thomas Richter c230a87879 minor changes 2013-05-31 16:40:24 +02:00
Thomas Richter 33563c3d37 names changed in Examples 2013-05-31 10:08:39 +02:00
Jan Steemann fadcb59423 issue #540 2013-05-23 15:24:40 +02:00