1
0
Fork 0
Commit Graph

952 Commits

Author SHA1 Message Date
Jan Steemann e291764fa8 less CPU bashing in SYS_WAIT 2012-10-17 18:50:32 +02:00
Jan Steemann 7fc079d30a merge several fixes from devel into 1.1 2012-10-16 11:44:39 +02:00
Jan Steemann 634adedbf6 vastly improved error messages for end user 2012-10-15 22:52:50 +02:00
Jan Steemann a736f9994d add derived files 2012-10-15 10:23:10 +02:00
Jan Steemann bf3d14eb14 changed gitignore, added derived files 2012-10-15 09:36:50 +02:00
Frank Celler 195d6903c1 added generated files 2012-10-14 16:23:48 +02:00
Frank Celler 7c3547e815 Merge branch 'devel' of github.com:triAGENS/ArangoDB
Conflicts:
	Makefile.files
	Makefile.in
	js/actions/system/api-system.js
2012-10-11 23:18:55 +02:00
Jan Steemann 224e37a1ba fix some memory issues 2012-10-11 22:49:46 +02:00
Frank Celler 939c5ece15 Merge branch '1.0' of github.com:triAGENS/ArangoDB
Conflicts:
	CHANGELOG
	CONTRIBUTING.md
	Doxygen/arango-html.doxy
	Doxygen/arango-latex.doxy
	Doxygen/arango-xml.doxy
	Doxygen/arango.template
	Makefile.in
	Makefile.local
	Makefile.unittests
	VERSION
	config/config.sub
	configure
	configure.ac
	js/actions/system/api-system.js
	js/client/js-client.h
	js/common/bootstrap/js-modules.h
	js/server/js-ahuacatl.h
	packetize.sh
2012-10-11 15:19:44 +02:00
Jan Steemann 9ffc7a7cfd fix memory zone issues 2012-10-10 23:49:18 +02:00
Jan Steemann 13e0ab010b derived file committed 2012-10-08 15:49:55 +02:00
Oreste Panaia aac17f7b55 wrapper for memory mapped files add 2012-10-05 18:31:13 +08:00
Jan Steemann 3b5d4a4fc9 issue #204: allow import of tab-separated values
this enables the user to specify the tab as separator for arangoimp.
the separator and eol values used by arangoimp can now also consist of
more than one character.

updated documentation and added test cases
2012-09-30 01:38:32 +02:00
Jan Steemann 43b14d0254 fixed compile warnings when compiled with --disable-logger 2012-09-28 14:29:32 +02:00
Jan Steemann fe8ba2357c removed debug flag 2012-09-28 08:58:30 +02:00
Jan Steemann 7500ed1137 fixed memleak for weak dictionary 2012-09-27 14:58:35 +02:00
Jan Steemann d3af4e04d3 typecast before delete 2012-09-27 13:53:34 +02:00
Jan Steemann 0a4282ebef fixed mismatched free/delete for WeakDictionary 2012-09-27 13:46:47 +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 04308d6cb6 bugfix: zero length strings 2012-09-26 09:26:58 +02:00
Jan Steemann 10d6167d45 removed some unused compile options 2012-09-25 21:24:02 +02:00
a-brandt fe7f2f8079 ICU changes 2012-09-24 11:40:06 +02:00
Frank Celler 4181fd5cc4 regenerated files 2012-09-21 17:44:25 +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
Jan Steemann b682fa0fdb compiled with Bison 2.5 2012-09-19 09:29:55 +02:00
a-brandt d077c97f2c ICU updates 2012-09-18 15:42:46 +02: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 1b1d7ba877 renamed simple_collection to document_collection 2012-09-14 14:46:37 +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 ccdc384fdf Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	lib/BasicsC/strings.c
2012-09-13 16:45:05 +02:00
a-brandt 4dc64a546b added utf8 normalization function (uses icu) 2012-09-13 16:41:00 +02:00
Frank Celler 49b19e4657 Merge branch 'devel' of github.com:triAGENS/ArangoDB
Conflicts:
	lib/BasicsC/terminal-utils-posix.c
	lib/BasicsC/terminal-utils.c
	lib/SimpleHttpClient/SimpleHttpResult.cpp
2012-09-12 23:49:14 +02:00
Frank Celler e8089d86a7 removed user manager 2012-09-12 23:37:39 +02:00
Jan Steemann 28bb0da87f issue #195: added SYS_SAVE() function to save files 2012-09-12 21:52:04 +02:00
Jan Steemann b8e7d5634d issue #153: edge collection should be a flag for a collection 2012-08-28 10:48:24 +02:00
Jan Steemann 24933367e2 fixed doxygen error 2012-08-14 16:00:21 +02:00
Frank Celler e78f7f5a3e fixed doc 2012-08-10 15:30:31 +02:00
Frank Celler 69a8e64f9b Merge branch 'master' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	.gitignore
	Makefile.in
	Makefile.local
	Makefile.unittests
2012-08-09 15:25:29 +02:00
Frank Celler c9673e08b3 added internal.wait 2012-08-08 15:33:11 +02:00
Frank Celler b0e452f74a Merge branch 'master' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	CHANGELOG
	Makefile.am
	Makefile.in
	arangod/V8Server/v8-vocbase.cpp
2012-08-02 17:17:36 +02:00
Frank Celler 325a4d59bb datafile check 2012-07-28 20:57:03 +02:00
Frank Celler a02faec3a3 added basic authentication 2012-07-15 17:06:59 +02:00
Frank Celler 1df2799005 added --javascript.script
renamed --unit-tests to --javascript.unit-tests
2012-07-15 00:50:05 +02:00
Frank Celler 2c9d3ded48 regenerated files 2012-06-24 20:44:51 +02:00
Frank Celler 94c954b8fd application v8 2012-06-21 22:40:11 +02:00
Frank Celler 55ebf00dbd Merge branch 'devel' of github.com:triAGENS/ArangoDB
Conflicts:
	Actions/RestActionHandler.cpp
	Actions/RestActionHandler.h
	Makefile.files
	Makefile.in
	RestHandler/RestActionHandler.cpp
	RestHandler/RestActionHandler.h
	RestServer/ActionDispatcherThread.cpp
	RestServer/ActionDispatcherThread.h
	RestServer/RubyDispatcherThread.cpp
	RestServer/RubyDispatcherThread.h
	arangod/RestHandler/RestActionHandler.cpp
	arangod/RestHandler/RestActionHandler.h
	arangod/RestServer/ActionDispatcherThread.cpp
	arangod/RestServer/ActionDispatcherThread.h
	arangod/RestServer/ArangoServer.cpp
2012-06-08 15:57:33 +02:00
Frank Celler d2c758d663 the great rename 2012-06-08 15:01:25 +02:00