1
0
Fork 0
Commit Graph

362 Commits

Author SHA1 Message Date
a-brandt e957c99b14 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-26 12:39:09 +02:00
Oreste Panaia a4d551653d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-26 19:11:18 +08:00
Oreste Panaia ba63b36b53 With git you never know 2012-09-26 19:10:48 +08:00
a-brandt 03249fc953 fixed warning 2012-09-26 12:38:34 +02:00
Jan Steemann cd3edb21a7 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-26 10:29:59 +02:00
Jan Steemann 210bfe7771 generalised arangob test cases 2012-09-26 10:29:32 +02:00
Jan Steemann 6def99c226 changed method visibility, cleanup 2012-09-26 09:32:42 +02:00
a-brandt 04308d6cb6 bugfix: zero length strings 2012-09-26 09:26:58 +02:00
Jan Steemann a540315dca removed some strlens 2012-09-26 09:11:13 +02:00
Jan Steemann 0a2466fdd6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-26 08:44:39 +02:00
Jan Steemann 89754433dd switched to C mersenne twister implementation in BasicsC 2012-09-25 22:57:47 +02:00
Jan Steemann d6d36bd4c3 added configure option --enable-maintainer-mode. this replaces the previous options --enable-bison, --enable-flex, --enable-errors-depedency, and --with-boost-test 2012-09-25 21:53:24 +02:00
Jan Steemann 10d6167d45 removed some unused compile options 2012-09-25 21:24:02 +02:00
Jan Steemann a57a7bdb8a micro optimisations (root of all ...) 2012-09-25 19:08:00 +02:00
Jan Steemann 01d0089e51 some minor optimisations for json to string conversion 2012-09-25 18:34:36 +02:00
Jan Steemann 3066ba6db4 do not delete response. some other method will do this 2012-09-25 17:55:16 +02:00
Jan Steemann ce3936df9a some cleanup 2012-09-25 16:12:20 +02:00
Jan Steemann 0619c9960c fixed arangob for batch requests 2012-09-25 11:46:15 +02:00
Jan Steemann df6008849d added comment 2012-09-25 10:17:16 +02:00
Jan Steemann bf7ddd5356 added X-Arango headers 2012-09-25 09:41:29 +02:00
Jan Steemann aeb9f5126b fixed seeding of rng 2012-09-25 09:27:43 +02:00
Jan Steemann 27dc95dd35 removed dependency on boost library 2012-09-24 19:11:38 +02:00
Jan Steemann 3bc0934dfb removed reference to boost/scoped_ptr 2012-09-24 17:59:55 +02:00
Jan Steemann 50b12a2d0e removed reference to boost/scoped_array 2012-09-24 17:59:07 +02:00
Jan Steemann 68b3d7e4f9 some multipart fixes 2012-09-24 17:35:07 +02:00
Jan Steemann eac884ec6c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-24 17:00:05 +02:00
Jan Steemann 89cffbe083 set log level to info (which is the default otherwise) for unknown log levels 2012-09-24 16:59:35 +02:00
Jan Steemann 4ad85e7037 added HttpResponsePart class 2012-09-24 16:59:19 +02:00
a-brandt ae318ea42f Documentation update 2012-09-24 15:37:21 +02:00
Jan Steemann a3dee04647 removed zeromq 2012-09-24 15:27:27 +02:00
Jan Steemann 3526804033 removed protocolbuffers 2012-09-24 13:53:14 +02:00
Jan Steemann f08a788f7c removed protocol buffers 2012-09-24 13:44:30 +02:00
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