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

498 Commits

Author SHA1 Message Date
Frank Celler cfe80c6b9c added generated files 2012-11-27 12:54:19 +01:00
Frank Celler 832be07319 Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	Makefile.in
	lib/BasicsC/logging.c
	utils/arango-upgrade.in
 2012-11-27 12:37:41 +01:00
Frank Celler 6e94eeb36f Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2012-11-27 12:35:12 +01:00
Frank Celler 249492a89c Merge remote-tracking branch 'origin/1.1' into devel 
Conflicts:
	CHANGELOG
	Documentation/Manual/GlossaryCollectionName.md
	Documentation/Manual/NewFeatures11.md
	Documentation/UserManual/FirstStepsArangoDB.md
	VERSION
	arangod/Documentation/api-blueprints.dox
	arangod/HashIndex/hasharray.c
	arangod/RestHandler/RestVocbaseBaseHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/v8-actions.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/compactor.c
	arangod/VocBase/document-collection.c
	configure.ac
	html/admin/js/master.js
	js/server/ahuacatl.js
	js/server/arango-upgrade.js
	lib/BasicsC/voc-errors.h
	lib/V8/V8LineEditor.cpp
	lib/V8/v8-utils.cpp
 2012-11-27 12:34:58 +01:00
Jan Steemann ad6489c2b7 issue #295 2012-11-27 12:30:12 +01:00
Jan Steemann 1d98ab44fc issue #295 2012-11-27 12:23:26 +01:00
Jan Steemann 5a14e6904b fixed readline ambiguous completion on Ubuntu 2012-11-23 23:33:40 +01:00
Jan Steemann bc94851026 fixed compile warnings 2012-11-23 13:18:00 +01:00
Jan Steemann e7f8543d81 moved documentation changes from 1.1 to devel 2012-11-23 10:18:47 +01:00
Jan Steemann b2faa016a6 fixed gcc compile warnings 2012-11-22 21:34:41 +01:00
Jan Steemann aaf34f44f4 fixed lots of compile warnings 2012-11-22 21:20:22 +01:00
Jan Steemann e3ea632773 issue #289 2012-11-22 10:32:29 +01:00
Jan Steemann a0fd0f6c87 issue #289 2012-11-22 10:30:12 +01:00
Jan Steemann ecbebaa60e issue #289 2012-11-22 10:21:58 +01:00
Jan Steemann ad855bd2bd fixed doxygen errors 2012-11-21 18:10:45 +01:00
Frank Celler cccb3511c5 fixed documentation again 2012-11-21 17:42:13 +01:00
Frank Celler 18bfd048ef fixed documentation 2012-11-21 10:58:29 +01:00
Jan Steemann 55463a6c64 fixed race conditions in multi-threading that may happen in some environments. looks like va_copy etc. are not always thread safe... 2012-11-20 21:04:19 +01:00
Jan Steemann fa525a309b fixed invalid usage of content-length 2012-11-20 15:44:02 +01:00
Jan Steemann c315c4466d do not send a content-length header on GET/HEAD/DELETE requests 2012-11-20 15:36:52 +01:00
Jan Steemann 2efa2f32db added server version check 2012-11-20 09:27:28 +01:00
Jan Steemann 85a8f56a34 complain about non-expected database directory versions 2012-11-20 01:41:41 +01:00
Jan Steemann 3718f3570d ALL() moved to transaction semantics 2012-11-19 13:07:38 +01:00
Jan Steemann 38025fbc31 documents and edges are now created using transaction contexts 2012-11-16 15:36:44 +01:00
Jan Steemann b416bc1a4b removed JsonContainer, introduced more general ResourceHolder class 2012-11-16 13:29:19 +01:00
Jan Steemann 3009bdfcfd issue #277 2012-11-15 22:55:59 +01:00
Jan Steemann ace85c43c9 nesting transactions from v8-vocbase... 2012-11-15 18:55:52 +01:00
Jan Steemann fe7e061a27 transaction nesting 2012-11-15 18:14:20 +01:00
Jan Steemann fddcea9d4e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangod/Utils/Collection.h
 2012-11-15 13:59:54 +01:00
Jan Steemann 1ff2430e39 transaction refactoring 2012-11-15 13:53:11 +01:00
a-brandt 407ac48821 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-11-15 11:25:22 +01:00
a-brandt 71d3d54de1 collection info struct changed 2012-11-15 11:24:35 +01:00
Jan Steemann 12d76b8306 introduced additional transaction type for import 2012-11-15 09:52:47 +01:00
a-brandt 8fa0869fa9 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-11-14 13:36:01 +01:00
a-brandt cf89b42da9 added missing url decode and utf8 normalize 2012-11-14 13:35:20 +01:00
Jan Steemann 30ba8771a7 pluggable key generators 2012-11-14 12:44:56 +01:00
Jan Steemann f483e9c41c added threadNumber global variable 2012-11-12 09:45:38 +01:00
Jan Steemann 6b6b692592 cleaned up v8 function creation 2012-11-12 09:30:51 +01:00
Jan Steemann d7aa6d7d0a more cleanup 2012-11-09 18:42:07 +01:00
Jan Steemann 008ad959d5 fixed octal conversion, wrote tests 2012-11-08 15:07:48 +01:00
Jan Steemann e438108f90 moved and fixed hex conversion, wrote tests for hex conversion 2012-11-08 14:31:49 +01:00
Jan Steemann 85ea90afdb removed redundant conversion functions 2012-11-08 13:55:12 +01:00
Jan Steemann d2d5b439d5 added conversion functions for int8 and int16 2012-11-08 13:33:39 +01:00
Jan Steemann 16ee94def3 added in-place num-to-string conversions, added tests for conversions 2012-11-08 13:13:30 +01:00
Jan Steemann e657f9d6b4 made "_vertices" a shared string 2012-11-06 19:35:51 +01:00
Jan Steemann dacd2fb70c some cleanup 2012-11-06 19:24:27 +01:00
Jan Steemann 59791248bf some refactoring of v8-vocbase, trx integration 2012-11-06 19:02:09 +01:00
Jan Steemann 203560d30b moved transactions into javascript object 2012-11-06 14:42:52 +01:00
Jan Steemann 0ed1f985fe create private copies of other write transactions 2012-11-06 12:56:51 +01:00
Jan Steemann d9f8219bd6 added --enable-trx option 2012-10-31 11:21:06 +01:00