1
0
Fork 0
Commit Graph

175 Commits

Author SHA1 Message Date
a-brandt 144c5ca634 bugfix wrong function call for mruby 2013-06-04 15:18:51 +02:00
a-brandt 0096f297ca added _endpoints and _prefix collection 2013-06-04 14:56:42 +02:00
a-brandt 1d255a9861 renamed a function 2013-06-03 17:42:21 +02:00
a-brandt 144af0c277 deleted old code 2013-06-03 17:38:11 +02:00
a-brandt 1c0578c2b5 Merge branch 'devel' into multiple_databases
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangod/VocBase/vocbase.c
	lib/HttpServer/ApplicationEndpointServer.cpp
	lib/HttpServer/ApplicationEndpointServer.h
	lib/HttpServer/HttpCommTask.h
	lib/HttpServer/HttpHandlerFactory.cpp
	lib/HttpServer/HttpHandlerFactory.h
	lib/Rest/HttpRequest.cpp
	lib/Rest/HttpRequest.h
2013-06-03 17:05:01 +02:00
Jan Steemann c59f00efa8 fixed handling of --temp-path 2013-05-15 15:55:48 +02:00
Frank Celler e98a22a31c added suffix .history to history files 2013-05-10 10:59:53 +02:00
Jan Steemann 2c381d5d6a issue #498 2013-05-02 12:27:06 +02:00
a-brandt 8f52b8916b vocbase handling 2013-04-22 14:52:46 +02:00
a-brandt fcae2b2961 added RequestContext 2013-04-17 16:56:48 +02:00
a-brandt aa216c2edb changes for multiple databases 2013-04-12 14:15:06 +02:00
Frank Celler f810711a79 FreeBSD port 2013-04-02 18:43:10 +02:00
Frank Celler 7a6cdcf9b1 changing to app-id 2013-03-27 15:05:08 +01:00
Frank Celler be971602f2 added install and uninstall of FOXX apps 2013-03-27 11:32:39 +01:00
Jan Steemann 071144ecc0 temporary file functons 2013-03-24 14:32:09 +01:00
Jan Steemann d9595caaf5 added upload API 2013-03-24 13:17:50 +01:00
Frank Celler a8d5a06f57 added resetEngine 2013-03-22 18:09:01 +01:00
Frank Celler 38a5cf6a2d added development-mode 2013-03-22 17:33:25 +01:00
Jan Steemann 61af5f27da added startup option `--database.force-sync-properties` 2013-03-14 13:48:58 +01:00
Frank Celler 1aa5109fa3 updated disclaimer 2013-03-13 17:03:18 +01:00
Jan Steemann b66a7492b9 addendum for issue #443 2013-03-08 22:30:35 +01:00
Jan Steemann 1ea4c1c4b0 issue #443 2013-03-08 15:16:29 +01:00
Jan Steemann 0a883f4076 merged some changes from trx branch into devel 2013-03-08 14:22:25 +01:00
Jan Steemann deb8946e1d added build date 2013-03-08 13:32:12 +01:00
Jan Steemann 092327058b potential solution for #438 (non-windows) 2013-03-07 10:50:40 +01:00
Jan Steemann 0fb397eabd adjusted startup output to be more compact, less verbose 2013-03-06 19:05:17 +01:00
a-brandt 58148f33a4 changed nonce handling 2013-03-04 14:03:22 +01:00
a-brandt d6392971bf Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-04 09:06:45 +01:00
Frank Celler 60037971dc rewrote statistics 2013-03-03 22:39:41 +01:00
a-brandt 8d78bb1c60 added rondom generator and nonce support 2013-03-01 16:48:37 +01:00
Oreste Panaia fc5e1ba623 merge conflicts with devel 2013-02-28 19:42:58 +08:00
Oreste Panaia a48696ec28 network modifications required for windows 2013-02-28 17:43:39 +08:00
Jan Steemann 54449494bc issue #432: added option to turn off statistics gathering
without recompilation
2013-02-25 17:43:13 +01:00
Jan Steemann a417429fba fixed memory-zone mismatch 2013-02-19 13:25:47 +01:00
Frank Celler e4d1c8a6bd partly fix for issue #333: [debian] Group arangodb is not used when starting vie init.d script 2013-02-15 11:50:05 +01:00
Frank Celler 069dcdfc94 changed logging of fatal errors 2013-02-14 16:47:35 +01:00
a-brandt 4daf9d618b added "v8::V8::LowMemoryNotification()" before "while (!v8::V8::IdleNotification())" to trigger V8 GC 2013-02-08 14:20:12 +01:00
Jan Steemann 7d99d900c6 unified history file locations 2013-01-31 10:58:59 +01:00
Oreste Panaia 3c8093849a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-01-31 00:07:19 +08:00
Oreste Panaia e0b7fbbf8d windows icu 2013-01-31 00:04:20 +08:00
a-brandt a4a1affab3 deleted TRI_HAVE_ICU 2013-01-22 14:47:07 +01:00
Frank Celler 3c21a87366 more cleanup 2013-01-17 16:01:15 +01:00
Frank Celler dae6577276 added show marker info 2013-01-14 02:20:06 +01:00
Jan Steemann 187d8ecc69 some transaction rework 2013-01-08 17:26:16 +01:00
Frank Celler 0549528325 Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	CHANGELOG
	Makefile.in
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/v8-vocbase.cpp
	html/admin/js/master.js
	js/actions/system/api-collection.js
	js/common/bootstrap/errors.js
	js/server/version-check.js
	lib/BasicsC/errors.dat
	lib/BasicsC/logging.c
	lib/BasicsC/voc-errors.c
	lib/BasicsC/voc-errors.h
2013-01-05 11:16:50 +01:00
Frank Celler f9dba124dd Merge remote-tracking branch 'origin/issue317' into 1.1
Conflicts:
	js/common/bootstrap/modules.js
2013-01-03 18:57:18 +01:00
Frank Celler 3d7e0b02b2 renamed "shell" to "emergency console" 2013-01-03 17:13:37 +01:00
Frank Celler 53364b7f15 updated error codes 2013-01-03 16:31:55 +01:00
Frank Celler 503e0ff8fe fixed merge conflicts 2013-01-02 18:07:57 +01:00
Frank Celler f188357f83 added padding for 32bit 2013-01-02 17:07:44 +01:00