1
0
Fork 0
Commit Graph

78 Commits

Author SHA1 Message Date
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
Frank Celler c57ffb7e8f updated mruby to 15cf8fdea4a6598aa470e698e8cbc9b9b492319d 2012-09-20 12:41:25 +02:00
a-brandt 5f86ce2df3 added CC and CXX to configure 2012-09-19 13:31:16 +02:00
a-brandt 5bfe33d0b5 added missing file 2012-09-17 16:32:16 +02:00
a-brandt d5562c5c72 Added ICU to 3rdParty libs 2012-09-17 16:12:49 +02:00
Jan Steemann 7d512be4bb make clean deletes more 2012-09-14 15:40:29 +02:00
Frank Celler 2ab77278d9 changes to allow SUBDIR build 2012-08-30 18:06:23 +02:00
Frank Celler 39f4a8f833 cleanup directory structure and init file handling
moved common functions to ArangoClient
2012-08-30 16:54:42 +02:00
Jan Steemann b29d303488 fixed sporadically failing test 2012-08-15 12:43:20 +02:00
Frank Celler 9e1acf7a75 yesterday 2012-07-02 18:47:12 +02:00
Frank Celler f529c88a69 new mruby version ac5838ac67d489c5321ac9cb0e8d6e50c6c4fd6f 2012-07-02 14:26:40 +02:00
Frank Celler cd72a699a0 back to 3.9.4 2012-06-21 22:34:47 +02:00
Frank Celler 7794bebfa0 3.9.24 2012-06-21 18:37:09 +02:00
Frank Celler f37007bfe0 added czmq 2012-06-19 09:48:44 +02:00
Frank Celler 42a58a7efe added zeromq target 2012-06-11 18:41:57 +02:00
Frank Celler 263a1c345c added protocol buffers 2012-06-11 17:58:05 +02:00
Frank Celler 53cd551def added protocol buffer 2012-06-11 13:00:55 +02:00
Frank Celler c1aa906b0d added zeromq 2012-06-11 12:20:54 +02:00
Frank Celler a7208484ea moved to Actions directory 2012-06-06 23:33:35 +02:00
Frank Celler 2921e12d93 separated action dispatcher for JavaScript and Ruby 2012-06-06 18:32:24 +02:00
Frank Celler 46b9824c1c cleanup of options, renamed queues to XXX-JAVASCRIPT or XXX-RUBY, extra QUEUE for CRUD and Import 2012-06-03 13:31:50 +02:00
Frank Celler 7b3f93a6c1 removed -O3 from DEBUG_MODE 2012-06-02 20:12:49 +02:00
Frank Celler 9b50a9b89d added new mruby 2012-06-02 12:21:27 +02:00
Frank Celler d24dcf5407 fixed warning 2012-05-23 11:33:57 +02:00
Frank Celler e88418daab silence warnings 2012-05-22 17:13:38 +02:00
Frank Celler 2e250ebc34 trying to fix race condition 2012-05-22 14:31:16 +02:00
Frank Celler 23920ddc69 added more ruby code 2012-05-21 10:46:52 +02:00
Frank Celler 00ea15fffc exception and json parser 2012-05-20 12:40:21 +02:00
Frank Celler 90d60061d2 added JSON parse 2012-05-17 23:23:45 +02:00
Frank Celler 2f2ecea725 new mruby version 2012-05-16 08:08:12 +02:00
Frank Celler 59b2cacfd3 new mruby version 2012-05-16 08:08:09 +02:00
Frank Celler e3dc8b7b1b no bison 2012-04-27 18:29:56 +02:00
Frank Celler e061a3fbe8 no bison 2012-04-27 18:24:45 +02:00
Frank Celler 5e96fd0947 no bison 2012-04-27 18:01:06 +02:00
Frank Celler 1d40c9ec08 -O2 2012-04-27 17:49:28 +02:00
Frank Celler fd3cde0c18 version 2012-04-27 2012-04-27 15:20:17 +02:00
Frank Celler 65336e093a new mruby version 2012-04-25 13:58:28 +02:00
Frank Celler 60b292e1bf updated mruby 2012-04-22 08:57:48 +02:00
Frank Celler ac54105d07 trying to a sym link 2012-04-21 12:11:45 +02:00
Frank Celler e1b77163a1 github 2012-04-21 12:11:15 +02:00
Frank Celler 2e01cf2368 github 2012-04-21 12:11:13 +02:00
Frank Celler b9756a9e63 github version 2012-04-20 21:20:15 +02:00
Frank Celler 73733a6d4b github version 2012-04-20 21:20:14 +02:00
Frank Celler b7de02e161 deleted 2012-04-20 21:18:25 +02:00
Frank Celler 7978283a9a first tests 2012-04-20 17:22:56 +02:00
Frank Celler d1790d905b update 2012-04-17 15:28:49 +02:00
Frank Celler d0e55bca64 3.9.4 2012-04-17 15:28:49 +02:00
Frank Celler 2c071d63af back to 3.9.4 2012-04-17 15:28:48 +02:00
Frank Celler 523f2ebf5d 3.9.24 2012-04-17 15:28:48 +02:00