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

330 Commits

Author SHA1 Message Date
Jan Steemann 4ea0364efd removed unnecessary dependency to Boost 2012-09-24 12:34:57 +02:00
a-brandt fe7f2f8079 ICU changes 2012-09-24 11:40:06 +02:00
Jan Steemann 942f8e0534 do not deleted derived files if configure options do not allow this 2012-09-24 10:17:56 +02:00
Frank Celler 4181fd5cc4 regenerated files 2012-09-21 17:44:25 +02:00
Frank Celler 403b4db931 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2012-09-21 10:12:12 +02:00
Frank Celler 352c093f81 merged with 1.0 2012-09-21 10:10:34 +02:00
Jan Steemann bea699b734 some fix for json conversion 2012-09-21 09:26:53 +02:00
Jan Steemann dc7c47ae84 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-20 18:14:23 +02:00
Jan Steemann 18cd515737 added protobuf to json converter 2012-09-20 18:14:00 +02:00
Frank Celler e9b1e1c58f Merge branch '1.0' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	3rdParty/mruby/include/mrbconf.h
	3rdParty/mruby/include/mruby.h
	3rdParty/mruby/include/mruby/array.h
	3rdParty/mruby/include/mruby/khash.h
	3rdParty/mruby/include/mruby/object.h
	3rdParty/mruby/include/mruby/variable.h
	3rdParty/mruby/mrblib/error.rb
	3rdParty/mruby/mrblib/print.rb
	3rdParty/mruby/src/array.c
	3rdParty/mruby/src/cdump.c
	3rdParty/mruby/src/class.c
	3rdParty/mruby/src/codegen.c
	3rdParty/mruby/src/error.c
	3rdParty/mruby/src/gc.c
	3rdParty/mruby/src/init.c
	3rdParty/mruby/src/kernel.c
	3rdParty/mruby/src/math.c
	3rdParty/mruby/src/numeric.c
	3rdParty/mruby/src/object.c
	3rdParty/mruby/src/parse.y
	3rdParty/mruby/src/pool.c
	3rdParty/mruby/src/proc.c
	3rdParty/mruby/src/range.c
	3rdParty/mruby/src/sprintf.c
	3rdParty/mruby/src/state.c
	3rdParty/mruby/src/string.c
	3rdParty/mruby/src/struct.c
	3rdParty/mruby/src/symbol.c
	3rdParty/mruby/src/time.c
	3rdParty/mruby/src/variable.c
	3rdParty/mruby/src/vm.c
	3rdParty/mruby/src/y.tab.c
	3rdParty/mruby/test/assert.rb
	3rdParty/mruby/test/t/array.rb
	3rdParty/mruby/test/t/exception.rb
	3rdParty/mruby/test/t/kernel.rb
	3rdParty/mruby/test/t/math.rb
	3rdParty/mruby/test/t/module.rb
	3rdParty/mruby/test/t/string.rb
	3rdParty/mruby/test/t/struct.rb
	3rdParty/mruby/test/t/time.rb
	3rdParty/mruby/tools/mirb/mirb.c
	3rdParty/mruby/tools/mruby/mruby.c
	Doxygen/arango-html.doxy
	Doxygen/arango.template
	Makefile.am
	Makefile.in
	UnitTests/HttpInterface/api-http-spec.rb
	aclocal.m4
	arangod/RestHandler/RestDocumentHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/ApplicationV8.h
	arangod/V8Server/v8-actions.cpp
	arangod/V8Server/v8-query.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/V8Server/v8-vocbase.h
	arangod/VocBase/compactor.c
	arangod/VocBase/compactor.h
	arangod/VocBase/shadow-data.c
	arangod/VocBase/simple-collection.c
	arangod/VocBase/simple-collection.h
	arangod/VocBase/synchroniser.c
	arangod/VocBase/vocbase.c
	arangoirb/MRClient/arangoirb.cpp
	config/compile
	config/depcomp
	config/install-sh
	config/missing
	configure
	js/actions/demo/geo.js
	js/actions/demo/hallo-world.js
	js/actions/system/api-collection.js
	js/actions/system/api-edges.js
	js/actions/system/api-system.js
	js/actions/system/documents.js
	lib/BasicsC/locks-posix.c
	lib/BasicsC/operating-system.h
	lib/HttpServer/HttpCommTask.cpp
	lib/HttpServer/HttpCommTask.h
	lib/MRuby/MRLineEditor.cpp
	lib/MRuby/mr-utils.c
	m4/Makefile.doxygen
	m4/all-in-one.mruby
 2012-09-20 16:39:59 +02:00
Frank Celler d8a43e6f86 added dep for protoc 2012-09-20 14:21:12 +02:00
Jan Steemann 61d49924be more binary handling 2012-09-20 13:11:33 +02:00
Frank Celler b36fa7c582 Merge branch 'master' of github.com:triAGENS/ArangoDB into 1.0 2012-09-20 12:42:41 +02:00
Frank Celler c57ffb7e8f updated mruby to 15cf8fdea4a6598aa470e698e8cbc9b9b492319d 2012-09-20 12:41:25 +02:00
Jan Steemann dba9e6e29c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-20 11:33:39 +02:00
Jan Steemann 879573944c bugfixes, accept longer binary messages 2012-09-20 11:33:14 +02:00
a-brandt cb3770a9ae Change to work with ICU 48 2012-09-20 10:13:08 +02:00
Jan Steemann cd7178f9c5 fixed serialisation/deserialisation of length 2012-09-19 19:12:36 +02:00
Jan Steemann 837c339e45 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-19 18:35:57 +02:00
Jan Steemann f9ea645a4e fixed UTF-16 comparison 2012-09-19 18:35:37 +02:00
Jan Steemann 29778d0b4d added binary client 2012-09-19 18:03:43 +02:00
a-brandt c3a5855689 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-19 16:58:54 +02:00
a-brandt c90d7f5f27 Added option --default-language to arangod 2012-09-19 16:57:34 +02:00
Jan Steemann 7bd8063468 before adding binary protocol 2012-09-19 15:48:24 +02:00
Frank Celler b191e9c464 Merge pull request #199 from triAGENS/1.0 
1.0
 2012-09-19 05:35:53 -07:00
Jan Steemann 7cee00a060 fixed g++ compile error 2012-09-19 10:32:01 +02:00
Jan Steemann eb1c4cec6d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-19 09:30:37 +02:00
Jan Steemann b682fa0fdb compiled with Bison 2.5 2012-09-19 09:29:55 +02:00
Oreste Panaia bd8bebed86 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-19 15:21:26 +08:00
Jan Steemann 614187c885 draft of benchmark client 2012-09-18 18:25:33 +02:00
a-brandt d077c97f2c ICU updates 2012-09-18 15:42:46 +02:00
Oreste Panaia 2ec059e758 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangod/Ahuacatl/ahuacatl-grammar.c
	arangod/Ahuacatl/ahuacatl-grammar.y
 2012-09-17 23:01:26 +08:00
Oreste Panaia f5316acb9d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangod/Ahuacatl/ahuacatl-grammar.c
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/document-collection.c
	arangod/VocBase/document-collection.h
 2012-09-17 22:40:12 +08:00
a-brandt b505cb77c8 bug fix: wrong default locale 2012-09-17 14:02:38 +02:00
Oreste Panaia c7e5eae52d Added additional error numbers for bitarray index creation 2012-09-17 19:57:10 +08:00
a-brandt 73d2c59836 bug fix: empty strings 2012-09-17 10:47:41 +02:00
a-brandt 4e2cbfbb15 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-17 09:51:21 +02:00
a-brandt 3666069569 Added UTF8/UTF16 normalize and compare functions (uses libicu) 2012-09-17 09:49:41 +02:00
Frank Celler 9212351c13 added path and prefix 2012-09-16 17:25:38 +02:00
Jan Steemann f7e98df4a3 removed unused error codes 2012-09-14 15:18:28 +02:00
Jan Steemann 1b1d7ba877 renamed simple_collection to document_collection 2012-09-14 14:46:37 +02:00
Jan Steemann 9bc99b7c9d renamed document collection to primary collection 2012-09-14 10:19:41 +02:00
a-brandt 1e98579792 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-14 10:14:32 +02:00
Jan Steemann 4790d0311c removed some unneeded globals 2012-09-14 09:34:43 +02:00
a-brandt fc2ab446fa Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-14 09:19:42 +02:00
Frank Celler 4cb179cad5 Merge branch 'master' of github.com:triAGENS/ArangoDB into devel 2012-09-13 22:16:31 +02:00
Frank Celler 5ffae32016 fix path and removed duplicate const 2012-09-13 21:19:09 +02:00
a-brandt db00ed1502 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-13 17:47:48 +02:00
Jan Steemann 967716a27b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-13 17:41:21 +02:00
Jan Steemann a932d335cb added guards for collection locking and read/write transactions 2012-09-13 17:40:38 +02:00