1
0
Fork 0
Commit Graph

193 Commits

Author SHA1 Message Date
Frank Celler 134ec1b2bb added --enable-internal-go 2014-02-27 16:50:06 +01:00
Max Neunhoeffer 0009020e5d Rename etcd executable to etcd-arango 2014-02-27 11:40:37 +01:00
Frank Celler e10bab8059 Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 2014-02-27 09:16:02 +01:00
Frank Celler 8406f51435 Merge remote-tracking branch 'origin/1.4' into devel
Conflicts:
	CHANGELOG
	VERSION
	arangod/Ahuacatl/ahuacatl-access-optimiser.c
	arangod/Ahuacatl/ahuacatl-codegen.c
	build.h
	configure
	configure.ac
	js/apps/system/aardvark/api-docs.json
	js/apps/system/aardvark/api-docs/batch.json
	js/apps/system/aardvark/api-docs/database.json
	js/apps/system/aardvark/api-docs/endpoint.json
	js/apps/system/aardvark/api-docs/job.json
	js/apps/system/aardvark/api-docs/replication.json
	js/apps/system/aardvark/api-docs/system.json
	js/apps/system/aardvark/frontend/js/modules/org/arangodb/graph/traversal.js
	js/common/modules/org/arangodb/graph/traversal.js
	js/server/modules/org/arangodb/ahuacatl.js
	lib/HttpServer/HttpCommTask.h
2014-02-27 09:13:03 +01:00
Max Neunhoeffer 67f00a38e0 Sort out clean script for etcd. 2014-02-27 08:47:13 +01:00
Max Neunhoeffer 83d7322d8c Remove some more files in clean script. 2014-02-27 00:06:10 +01:00
Max Neunhoeffer 7bc255c3d2 Try to fix etcd building with automake. 2014-02-26 23:50:32 +01:00
Max Neunhoeffer 9b6af14ab7 Add a clean script. 2014-02-26 23:44:46 +01:00
Max Neunhoeffer ef2e4cef5f Remove annoying .gitignore. 2014-02-26 23:30:33 +01:00
Max Neunhoeffer 03354b0e55 Forgot two libraries. 2014-02-26 23:27:04 +01:00
Max Neunhoeffer 9448ff8243 Add Makefile support for etcd. 2014-02-26 23:05:20 +01:00
Max Neunhoeffer 7dc9e89357 Add etcd v0.3.0. 2014-02-26 22:48:54 +01:00
Frank Celler 87a753da51 generate full libs 2014-02-26 22:14:42 +01:00
Max Neunhoeffer 70b1f7a330 Do not compile in SIGCHLD handling for libev. 2014-02-17 14:04:33 +01:00
Frank Celler 92172bc59a Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 2014-02-13 16:38:46 +01:00
Frank Celler 2a731eee62 fixed ctrl-z 2014-02-13 16:25:50 +01:00
Frank Celler 95472a82eb Merge remote-tracking branch 'origin/devel' into sharding
Conflicts:
	js/apps/system/aardvark/test/karma/karma.conf.js
2014-02-13 11:07:01 +01:00
Frank Celler 7a3176ac8d use new readline per default for mac 2014-02-13 11:03:48 +01:00
Jan Steemann e9c5af7895 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	CHANGELOG
	js/apps/system/aardvark/frontend/css/collectionsView.css
	js/apps/system/aardvark/frontend/css/layout.css
	js/apps/system/aardvark/frontend/js/routers/router.js
2014-01-30 19:40:21 +01:00
Frank Celler 6684b4cbcd fixed warning 2014-01-30 17:36:14 +01:00
Frank Celler 973f9aa2fb added linenoise 2014-01-30 17:23:24 +01:00
Jan Steemann 9e52c2b866 Windows fixes 2014-01-27 13:34:56 +01:00
Max Neunhoeffer 4f5b8f0462 Try to add boost libraries for shared_ptr. 2014-01-27 11:38:59 +01:00
Max Neunhoeffer cf5af072b8 Sort out "make distclean" to correctly delegate to icu. 2013-11-11 14:37:30 +01:00
Frank Celler 6363d2618c added missing file 2013-10-26 17:09:39 +02:00
Frank Celler b294240fda moved to icu 52.1 for Mavericks 2013-10-26 15:50:43 +02:00
Frank Celler c67f060e2d added modifications for raspberry 2013-10-13 10:48:58 +02:00
Frank Celler 39d8c00b74 removed generated file 2013-10-13 10:48:05 +02:00
Frank Celler f7eafa465f added armv7 2013-10-13 10:47:48 +02:00
Jan Steemann 4473a08461 don't generate pod2man 2013-09-05 14:23:50 +02:00
Jan Steemann 6b84c092eb remove pod2man 2013-08-28 20:44:18 +02:00
Frank Celler 09460a10a3 updated mruby to 2013-08-22
Conflicts:
	configure
2013-08-22 21:03:04 +02:00
Jan Steemann b47d661417 do not require pod2man 2013-08-02 19:05:08 +02:00
Frank Celler 828b939053 fixed isolates, made ArangoError internal 2013-04-10 21:22:09 +02:00
Frank Celler 37e134ff50 new Foxx 2013-04-04 18:56:38 +02:00
Frank Celler d411d14aed added generated file 2013-03-31 23:32:10 +02:00
Frank Celler fb3e20186a added generated files 2013-03-28 22:32:29 +01:00
Jan Steemann 76a86a853f fixed build? 2013-03-24 10:43:55 +01:00
Jan Steemann fd446bac1a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-03-23 19:14:02 +01:00
Jan Steemann 5cf913b2ca zlib 2013-03-23 19:13:31 +01:00
Frank Celler 629a519ca7 added gitignore 2013-03-23 16:45:45 +01:00
Frank Celler 4059f31170 return error message 2013-03-23 16:42:52 +01:00
Jan Steemann 1759b7d85a argl 2013-03-23 14:40:31 +01:00
Jan Steemann 189c3d87ec added configure 2013-03-23 14:39:38 +01:00
Jan Steemann d07bee0bde removed generated files 2013-03-23 14:26:36 +01:00
Jan Steemann 1dfc90bf0d added zlib 2013-03-23 14:24:01 +01:00
Frank Celler c915bfa5ff cleanup of indexes, fix for compaction (hash, cap, geo)
Conflicts:
	arangod/VocBase/compactor.c
	arangod/VocBase/document-collection.c
	arangod/VocBase/synchroniser.c
	arangod/VocBase/vocbase.c
2013-03-11 09:49:58 +01:00
Frank Celler dd96bb4abd Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-03 22:40:55 +01:00
Frank Celler 60037971dc rewrote statistics 2013-03-03 22:39:41 +01:00
Jan Steemann b6b60b487e removed CVS info 2013-03-01 12:04:11 +01:00
a-brandt e1502f5b81 added CFLAGS and CXXFLAGS 2013-02-27 13:14:56 +01:00
a-brandt b2f6d76dbe added werror=no to avoid too many errors 2013-02-19 15:52:38 +01:00
Jan Steemann 0585fa2e1d updated v8 version from 3.9.4 to 3.16.14.1 2013-02-18 15:03:02 +01:00
Frank Celler 2debef13f7 added more cleanup for 3rd party, see issue #269: fix make distclean & clean 2012-11-27 13:28:47 +01:00
Jan Steemann de13092bc1 issue #241 2012-10-15 10:23:53 +02:00
Frank Celler 1f96f6baaa removed generated files 2012-10-11 20:37:41 +02:00
Frank Celler 160b6a3661 using standard name 2012-10-11 19:14:05 +02:00
Frank Celler c293543011 cleanup of .gitignore 2012-10-11 16:18:53 +02:00
Jan Steemann afc80f51cd removed unneeded protobuf makefile 2012-10-11 15:59:43 +02:00
Frank Celler 27cf9d9b04 Merge branch 'devel' of github.com:triAGENS/ArangoDB
Conflicts:
	3rdParty/Makefile.all-in-one-zeromq
	Makefile.in
	js/actions/system/api-blueprint.js
	js/actions/system/api-system.js
2012-10-11 14:33:31 +02:00
Jan Steemann ee6da07841 fixed compile warning 2012-09-26 12:51:13 +02:00
Jan Steemann 27dc95dd35 removed dependency on boost library 2012-09-24 19:11:38 +02:00
Jan Steemann 1726e46a27 hopefully this time it will be deleted 2012-09-24 17:35:50 +02:00
Jan Steemann a3dee04647 removed zeromq 2012-09-24 15:27:27 +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
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 d147870919 added cleanup 2012-09-14 11:55:23 +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