Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
45,687 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

1380 Commits

Author SHA1 Message Date
Max Neunhoeffer dda787ba62 Even more debug output. 2014-03-14 11:01:24 +01:00
Jan Steemann 9da8d0ddfe allow startup options `temp-path` and `default-language` to be specified from the command-line and not only from config files 2014-03-12 12:12:58 +01:00
Jan Steemann 7df402d1cd removed command line option `--database.remove-on-drop` 2014-03-10 17:03:17 +01:00
Max Neunhoeffer cd0a33de9f Seemingly fix behaviour on Windows. 
Note: WSACleanup complains and we do not know a fix.
 2014-03-07 16:48:21 +01:00
Frank Celler 5a2fa4f37d stop if upgrade is needed 2014-03-01 16:14:29 +01:00
Frank Celler f22f1525d2 Merge branch 'sharding' of github.com:triAGENS/ArangoDB into sharding 
Conflicts:
	etc/relative/arangod.conf
 2014-02-28 12:03:11 +01:00
Frank Celler 9a410a5b71 added config for server state 2014-02-28 12:02:21 +01:00
Jan Steemann 897d6f4dcd fixed cluster authentication 2014-02-27 17:45:03 +01:00
Frank Celler 3afa2214f7 added disable-cluster-dispatcher 2014-02-27 11:47:26 +01:00
Jan Steemann 9ac1a7cc50 cluster-internal authentication 2014-02-26 12:01:41 +01:00
Jan Steemann 98ceb07b77 add initial user 2014-02-25 17:05:02 +01:00
Frank Celler f2121ff442 cleanup 2014-02-25 15:32:07 +01:00
Frank Celler 569778ae10 Merge branch 'sharding' of github.com:triAGENS/ArangoDB into sharding 2014-02-25 12:07:46 +01:00
Frank Celler 42fb8244e1 added requeue 2014-02-25 12:07:16 +01:00
Jan Steemann 018a8390ce refactored create/drop database 2014-02-24 14:50:31 +01:00
Jan Steemann 7a0aac82e2 re-create database objects on coordinator now, and switch into them 2014-02-21 17:40:00 +01:00
Frank Celler b01d9d77e7 Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/ApplicationV8.h
	arangod/V8Server/v8-actions.cpp
	js/apps/system/aardvark/frontend/js/bootstrap/module-internal.js
	js/apps/system/aardvark/frontend/scss/generated.css
	js/server/version-check.js
	lib/Dispatcher/Job.h
	lib/GeneralServer/GeneralServerJob.h
 2014-02-20 21:02:07 +01:00
Frank Celler 730da7623a added periodic tasks and statistics historian 2014-02-20 20:29:55 +01:00
Jan Steemann 4770fed362 removed dead code 2014-02-19 15:35:52 +01:00
Frank Celler c5d6e6a9d3 fixed rethrow 2014-02-17 16:54:03 +01:00
Max Neunhoeffer 98ed29ab84 Make check for useDatabase switchable for unittests. 2014-02-14 15:33:35 +01:00
Frank Celler eb95f1bee9 added rethrow 2014-02-13 16:58:46 +01:00
Frank Celler 739900fc2f try to force abort 2014-02-13 12:06:52 +01:00
Max Neunhoeffer 7df42c547e Lost a ). 2014-02-12 10:56:03 +01:00
Max Neunhoeffer 5c467148a3 Add HTTP REST API call for shutdown. 2014-02-12 10:47:43 +01:00
Max Neunhoeffer bc79698750 Make executable path and basePath available through ServerState. 2014-02-10 09:59:41 +01:00
Jan Steemann b4d9f10f17 fixed some database methods 2014-02-06 15:54:34 +01:00
Jan Steemann c38c038492 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	CHANGELOG
	js/apps/system/aardvark/frontend/css/collectionsItemView.css
	js/apps/system/aardvark/frontend/css/graphlayout.css
 2014-02-06 13:18:52 +01:00
Jan Steemann 18d872628e call global instance destructor 2014-02-02 09:23:04 +01:00
Jan Steemann 545742a5fd added option `--server.disable-authentication-unix-sockets` 
with this option, authentication can be disabled for all requests coming
in via UNIX domain sockets, enabling clients located on the same host as
the ArangoDB server to connect without authentication.
Other connections (e.g. TCP/IP) are not affected by this option.

The default value for this option is `false`.
Note: this option is only supported on platforms that support Unix domain
sockets.
 2014-02-02 00:22:07 +01:00
Jan Steemann e2a7e2dfb3 windows 2014-01-28 17:32:32 +01:00
Jan Steemann e906f68235 windows fixes 2014-01-27 17:46:15 +01:00
Jan Steemann 1b08bc6582 start up the HTTP server when starting ArangoDB in console mode 2014-01-27 09:45:26 +01:00
Jan Steemann a987647bd2 handle state changes 2014-01-16 14:52:40 +01:00
Michael Hackstein 9f3479f5b6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	utils/Makefile.files
 2014-01-10 17:41:52 +01:00
Jan Steemann 5b965b2a21 added initialised() method 2014-01-07 17:50:52 +01:00
Jan Steemann bb7f550f7a for Michael... 2014-01-07 16:46:18 +01:00
Jan Steemann 9ce78430ac create collections, v0.0.0 2014-01-07 16:28:12 +01:00
Jan Steemann 5c0e6e12e0 added tests for serverstate and clusterinfo 2014-01-06 18:19:14 +01:00
Jan Steemann d1bee4cf58 added functions to query the server state 2014-01-02 15:13:44 +01:00
Frank Celler 84507cfc44 merged changes from 1.4 back to devel 2013-12-27 14:59:23 +01:00
Max Neunhoeffer c9b2884def Full round trip implemented but not yet working. 2013-12-23 16:19:59 +01:00
Frank Celler 2d5a8eb5ca added service functions 2013-12-22 00:48:31 +01:00
Frank Celler 2d9f8e3986 removed --daemon and --supervisor for Windows 2013-12-21 13:29:55 +01:00
Frank Celler e57dceb42b arangod used same config as binary name 2013-12-21 01:36:25 +01:00
Jan Steemann 8eccb0a35f added dispatcher to shardhandler 2013-12-12 16:42:25 +01:00
Jan Steemann e1fb1f3d14 added stub REST API for cluster requests 2013-12-12 15:59:16 +01:00
Jan Steemann 13bcc2bf7a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2013-12-11 18:39:10 +01:00
Jan Steemann 5e5a5fb32b added JS bindings for agency 2013-12-11 09:56:54 +01:00
Jan Steemann 9e21cf9b7e added configure option --enable-cluster 2013-12-10 14:46:16 +01:00
Jan Steemann 8708dc7e70 renamed sharding to cluster 2013-12-10 09:56:00 +01:00
Jan Steemann 492b164373 added sharding application feature and initial startup options 2013-12-05 17:27:26 +01:00
Jan Steemann 44b3237882 moved server-only tests to js/server/tests 
this hopefully removes some future confusion about the tests
also moved some graph stuff into js/common as client-side graphs did not fully work

make logfile path accessible
 2013-12-04 22:05:00 +01:00
Jan Steemann ba2ddb8382 replaced if with ifdef 2013-11-25 10:56:08 +01:00
Jan Steemann 37dbda22ef added default pretty-printing for --console mode 2013-11-21 14:02:48 +01:00
Frank Celler 9f8f4cd4fd destroy can only be called if initialised 2013-11-18 18:40:13 +01:00
Frank Celler b58347138f destroy can only be called if initialised 2013-11-18 18:39:18 +01:00
Jan Steemann bfbc96d3e8 don't complain upon usage of obsolete --database.force-sync-shapes option 2013-11-14 01:25:55 +01:00
Jan Steemann a977c5662a removed --database.force-sync-shapes option 2013-11-05 18:20:55 +01:00
Jan Steemann 4f50b98c45 removed second logger implementation 2013-10-30 00:38:25 +01:00
Jan Steemann 4f30db9eda remove database-specific directories underneath app-path and dev-app-path when dropping databases 2013-10-14 10:35:32 +02:00
Jan Steemann af07091d1c Windows fixes 2013-10-09 15:33:38 +02:00
Jan Steemann 88f3830c53 refuse to start if no app path is set 2013-10-09 14:07:47 +02:00
Jan Steemann 012a171657 issue #600 2013-09-27 22:49:00 +02:00
Jan Steemann e3d9d95f3f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	lib/Admin/ApplicationAdminServer.cpp
	lib/GeneralServer/GeneralServerDispatcher.h
 2013-09-26 17:46:05 +02:00
Jan Steemann 5a422becd8 async job management 2013-09-26 17:30:03 +02:00
Jan Steemann 467a236187 re-added cache for HTTP authentication data 2013-09-26 11:26:34 +02:00
Jan Steemann 106fedd615 several errors fixed 2013-09-26 09:44:50 +02:00
Jan Steemann 97afd329ff updated documentation 2013-09-24 18:22:38 +02:00
Jan Steemann 1bf82999b9 endpoints handling 2013-09-23 14:26:09 +02:00
Jan Steemann 2e75c872f4 persist list of endpoints 2013-09-23 13:14:54 +02:00
Jan Steemann 5c0fd200f7 more OOM awareness 2013-09-19 08:44:12 +02:00
Jan Steemann 28e302b4b0 upgrade only when started with --upgrade 2013-09-17 15:34:28 +02:00
Jan Steemann 0bdae05b96 changed reference counting for cursors 2013-09-16 13:51:33 +02:00
Jan Steemann 8b5f4e2e65 changed mutex into rw-lock 2013-09-13 11:16:44 +02:00
Jan Steemann 6ff314de0e runtime addition and removal of endpoints 2013-09-12 18:07:39 +02:00
Jan Steemann 6bbfb65f7c prevent usage of db._useDatabase() in HTTP requests 2013-09-12 11:13:47 +02:00
Jan Steemann 3a6cabfe44 creating/dropping 2013-09-11 17:16:43 +02:00
Jan Steemann fde7793137 refactored database options 2013-09-11 13:22:52 +02:00
Jan Steemann 42441b208f refactoring of multiple databases, intermediate commit 2013-09-11 11:42:34 +02:00
Jan Steemann 05bdf94537 force lower-case database names 2013-09-05 12:43:03 +02:00
Jan Steemann 369433f1e2 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangosh/Benchmark/BenchmarkThread.h
	lib/SimpleHttpClient/SimpleHttpClient.cpp
 2013-09-05 12:34:45 +02:00
Jan Steemann ca2f5feb4b fixed redirect URLs 2013-09-04 17:30:37 +02:00
Jan Steemann 897412b4de initial dropping of databases 2013-09-04 13:04:13 +02:00
Jan Steemann bae9f097fc added _dropDatabase() 2013-09-02 18:04:19 +02:00
Jan Steemann 0b3a0e7cc0 added exclusive lock for database creation 2013-09-02 14:50:30 +02:00
Jan Steemann 42b8dfca49 added --server.database option for client tools 2013-09-02 13:02:53 +02:00
Jan Steemann 41acd59698 added _createDatabase(), _listDatabases() 2013-09-02 10:55:41 +02:00
Jan Steemann a53c1e493b multiple database, becoming standard 2013-09-02 09:52:52 +02:00
Jan Steemann 0aca109a89 removed html/admin, / now redirects to /_admin/aardvark by default 2013-08-29 12:59:56 +02:00
Jan Steemann 860ed964c3 simplify build.h 2013-08-28 22:20:06 +02:00
Jan Steemann 7cb6b7d922 simplified build.h stuff 2013-08-28 19:57:07 +02:00
Jan Steemann 08f09a6bc7 do not flush log messages after initialisation 2013-08-27 13:26:00 +02:00
Jan Steemann 0689d5cc5f removed dead files 2013-08-27 12:47:23 +02:00
Jan Steemann 9b8b030a8a added several tests for authentication 2013-08-22 11:18:11 +02:00
Jan Steemann 3871fb7af3 improved error messages 2013-08-20 11:48:08 +02:00
Jan Steemann bfc6648588 added server startup options `--server.disable-replication-logger` and `--server.disable-replication-applier` 2013-08-02 16:17:51 +02:00
Jan Steemann 949c194653 updated replication configuration 2013-08-01 15:50:30 +02:00
Jan Steemann c2611f567a bugfixed cap constraint 2013-08-01 13:17:38 +02:00
Jan Steemann 05a7f79941 re-configuration of logger, cap constraint 2013-07-31 14:39:33 +02:00
Jan Steemann 002ebd48bc removed all replication conditionals 2013-07-30 13:16:37 +02:00
Jan Steemann 6b5900e8e0 updated replication api 2013-07-30 09:54:39 +02:00
Oreste Panaia b8163e79c4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-07-12 22:40:37 +08:00
Jan Steemann 98dd1c2522 moved replication parts into separate files 2013-07-11 14:44:09 +02:00
Oreste Panaia 752a60025c merge conflicts 2013-07-08 16:47:39 +08:00
Oreste Panaia a7661542a2 windows 2012 fixes 2013-07-08 16:44:32 +08:00
Jan Steemann 7cc7f2d28e added authentication tests, fixed authentication 2013-06-27 13:53:19 +02:00
Jan Steemann 44eddc05c7 updated documentation for --server.authenticate-system-only 2013-06-27 11:32:43 +02:00
Jan Steemann 14422986e0 added option --server.authenticate-system-only 2013-06-26 23:23:37 +02:00
Jan Steemann f7fcd6119d added tests for special collections 2013-06-26 17:46:43 +02:00
Jan Steemann 6e9c3e8e2c replication logging 2013-06-26 12:04:55 +02:00
Jan Steemann e07e168bec indentation fix 2013-06-21 10:26:11 +02:00
Jan Steemann d9c0d588f9 added internal.adminDirectory 2013-06-20 15:47:48 +02:00
a-brandt 1f519da089 added configuration option to start in multiple database mode 2013-06-06 09:35:42 +02:00
a-brandt 3827ad8f52 added a log message 2013-06-06 09:34:15 +02:00
a-brandt 967e45e103 added adding of enpoints and prefix to database mappings 2013-06-05 17:29:00 +02:00
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 21f9da2104 moved database version check to VocbaseManager 2013-06-04 13:05:06 +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
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
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 45c815b7eb fixed issue #403: Usage of exit() etc. 2013-02-15 12:19:09 +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 ad570cf6c9 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-02-08 14:20:33 +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 3e140ec74a added a note about filesystems 2013-02-07 13:42:07 +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
Oreste Panaia bb54d606ad Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-01-22 23:06:39 +08:00
Oreste Panaia c4f6465ee7 attempt to link icu libraries into arango 2013-01-22 23:04:16 +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 7380ddfabe Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	arangosh/V8Client/arangosh.cpp
	bin/arango32.msi
	bin/arango64.msi
	lib/BasicsC/win-utils.c
 2013-01-15 15:50:47 +01:00
Oreste Panaia c01a5c6275 arango shell and import 2013-01-14 20:16:09 +08: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
Frank Celler dadcef3de3 renamed execute/load to executelocal and executeglobal 2013-01-02 14:52:55 +01:00
Frank Celler d5f24ce13c Merge remote-tracking branch 'origin/windows' into HEAD 
Conflicts:
	CHANGELOG
	Documentation/InstallationManual/Installing.md
	Documentation/Makefile.files
	Documentation/Scripts/generateTOC.py
	Documentation/header.html
	Installation/OBS/clean-repo.sh
	Installation/OBS/create-repo.sh
	Installation/OBS/create-ymp.sh
	Installation/OBS/index.html
	Installation/OBS/load-repo.sh
	Makefile.in
	VERSION
	aclocal.m4
	arangod/Ahuacatl/ahuacatl-functions.c
	arangod/Documentation/user-manual.dox
	arangod/V8Server/v8-actions.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/collection.c
	arangod/VocBase/datafile.c
	arangosh/V8Client/arangosh.cpp
	config/compile
	config/config.guess
	config/config.sub
	config/depcomp
	config/install-sh
	config/missing
	configure
	configure.ac
	js/server/arango-upgrade.js
	js/server/modules/org/arangodb/actions.js
	lib/BasicsC/logging.c
	lib/Utilities/ScriptLoader.cpp
 2012-12-20 11:11:47 +01:00
Oreste Panaia 83ded3fc1f windows fixes 2012-12-20 17:17:30 +08:00
Frank Celler 621e4409bc Merge remote-tracking branch 'origin/1.1' into devel 
Conflicts:
	.gitignore
	CHANGELOG
	Documentation/Makefile.files
	Installation/build.sh
	Installation/epm/arangodb.list
	Makefile.in
	README
	README.md
	VERSION
	aclocal.m4
	arangod/HashIndex/hasharray.c
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/ApplicationV8.cpp
	config/config.guess
	config/config.sub
	config/depcomp
	configure
	configure.ac
	html/admin/js/master.js
	js/server/arango-password.js
	js/server/version-check.js
	lib/BasicsC/files.c
	lib/BasicsC/logging.c
	utils/Makefile.files
 2012-12-18 13:37:34 +01:00
Jan Steemann b5d0457f3a fixed some issues reported by cppcheck 2012-12-12 18:42:11 +01:00
Jan Steemann 6d8851d83c protect against some invalid cases 2012-12-10 15:43:51 +01:00
Jan Steemann 9a9e8c3214 added test case for absolute path 2012-12-10 15:39:57 +01:00
Jan Steemann b16f672902 fixed some log errors on startup & shutdown 2012-12-10 15:18:35 +01:00
Oreste Panaia 857b66c490 windows version 2012-12-06 20:44:01 +08:00
Jan Steemann 1811ce9186 fixed some issues found by cppcheck 2012-12-04 18:21:29 +01:00
Jan Steemann cdbb96788f issue #313 2012-12-03 15:30:01 +01:00
Jan Steemann 182289b88f honor --upgrade option in console mode, too 2012-12-03 14:10:12 +01:00
Jan Steemann d60888e970 replaced arango-upgrade script with server startup option --upgrade 2012-12-03 13:45:58 +01:00
Jan Steemann a41357b9b3 removed unnecessary flag 2012-12-03 13:26:35 +01:00
Jan Steemann 42ba0502f0 changed upgrade procedure 
removed arango-upgrade script, replaced it with --upgrade server option
adjusted documentation & start scripts
 2012-12-03 13:02:59 +01:00
a-brandt 5a9e155dd7 added documentation for --default-language 2012-11-28 11:20:11 +01:00
a-brandt e9b4c324aa added ibcu and --default-language documentation 2012-11-27 13:46:45 +01:00
Frank Celler 249492a89c Merge remote-tracking branch 'origin/1.1' into devel 
Conflicts:
	CHANGELOG
	Documentation/Manual/GlossaryCollectionName.md
	Documentation/Manual/NewFeatures11.md
	Documentation/UserManual/FirstStepsArangoDB.md
	VERSION
	arangod/Documentation/api-blueprints.dox
	arangod/HashIndex/hasharray.c
	arangod/RestHandler/RestVocbaseBaseHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/v8-actions.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/compactor.c
	arangod/VocBase/document-collection.c
	configure.ac
	html/admin/js/master.js
	js/server/ahuacatl.js
	js/server/arango-upgrade.js
	lib/BasicsC/voc-errors.h
	lib/V8/V8LineEditor.cpp
	lib/V8/v8-utils.cpp
 2012-11-27 12:34:58 +01:00
Jan Steemann e7f8543d81 moved documentation changes from 1.1 to devel 2012-11-23 10:18:47 +01:00
Frank Celler cccb3511c5 fixed documentation again 2012-11-21 17:42:13 +01:00
Frank Celler 18bfd048ef fixed documentation 2012-11-21 10:58:29 +01:00
Jan Steemann a2b404123a load monkeypatches on all occasions 2012-11-20 16:50:15 +01:00
Jan Steemann 2efa2f32db added server version check 2012-11-20 09:27:28 +01:00
Jan Steemann 85a8f56a34 complain about non-expected database directory versions 2012-11-20 01:41:41 +01:00
Oreste Panaia 56cd3327a6 merge problems 2012-10-22 21:51:23 +08:00
Oreste Panaia 4d8d78e880 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	VisualStudio/Arango Front End Library/Arango Front End Library.vcxproj
	arangod/Actions/RestActionHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	lib/ApplicationServer/ApplicationServer.cpp
 2012-10-22 21:04:12 +08:00
Oreste Panaia aad73db128 various changes for windows 2012-10-22 20:51:31 +08:00
Frank Celler e8093d68fe upgraded to Doxygen 1.8.x 2012-10-18 16:38:20 +02:00
Jan Steemann 4cf6cc6a33 replaced new/delete with stack objects 2012-10-16 00:27:02 +02:00
Frank Celler c0c869d1ff Merge branch 'devel' of github.com:triAGENS/ArangoDB 
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangosh/ArangoShell/ArangoClient.cpp
	js/client/js-client.h
 2012-10-13 16:28:09 +02:00
Jan Steemann cc371c4eb0 centralised and unified bye message 2012-10-12 21:46:58 +02:00
Frank Celler 6f426a2cd3 Auf Wiedersehen in Greek 2012-10-11 20:07:40 +02:00
Jan Steemann a4b979222f fixed memory zone issues, memleaks 2012-10-10 19:05:16 +02:00
Jan Steemann 97723bbdf6 removed --enable-ssl configure option 
having OpenSSL installed is now a requirement for compiling ArangoDB
 2012-10-10 14:55:18 +02:00
Oreste Panaia aac17f7b55 wrapper for memory mapped files add 2012-10-05 18:31:13 +08:00
Jan Steemann 10d6167d45 removed some unused compile options 2012-09-25 21:24:02 +02:00
Jan Steemann 8a380eb81d fixed startup when compiled with --enable-zeromq 2012-09-24 13:55:15 +02:00
a-brandt fe7f2f8079 ICU changes 2012-09-24 11:40:06 +02:00
Frank Celler 352c093f81 merged with 1.0 2012-09-21 10:10:34 +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 c57ffb7e8f updated mruby to 15cf8fdea4a6598aa470e698e8cbc9b9b492319d 2012-09-20 12:41:25 +02:00
a-brandt c90d7f5f27 Added option --default-language to arangod 2012-09-19 16:57:34 +02:00
Jan Steemann 9bc99b7c9d renamed document collection to primary collection 2012-09-14 10:19:41 +02:00
Frank Celler 5075e1f764 removed JsonParserX 2012-09-12 23:50:22 +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 6e6db55258 issue #195 2012-09-12 21:56:24 +02:00
Jan Steemann 650261faed issue #195: make arango-upgrade write VERSION file, add global Javascript variable DATABASEPATH 2012-09-12 21:53:01 +02:00
Jan Steemann 442c033122 start statistics thread even in supervisor mode 2012-09-07 15:29:30 +02:00
Jan Steemann 7c50dc7dca clear existing sessions on shutdown. this prevents a valgrind warning 2012-09-04 16:52:15 +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 b8e7d5634d issue #153: edge collection should be a flag for a collection 2012-08-28 10:48:24 +02:00
Frank Celler d26b082ef6 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	CHANGELOG
	Makefile.in
	UnitTests/Makefile.files
 2012-08-24 09:59:16 +02:00
Jan Steemann 4b16882b44 issue #131: make keep alive timeout configurable 2012-08-20 15:42:11 +02:00
Jan Steemann fc624d464c fixed "reference error: VALGRIND is not defined" 2012-08-20 13:01:55 +02:00
Frank Celler fa41864b7a Merge remote-tracking branch 'origin/1.0' into devel 
Conflicts:
	Installation/MacOSX/MacPorts/arango.conf
	Installation/arangod.conf.in
	Makefile.in
	arangod/RestServer/ArangoServer.h
	configure
	lib/V8/v8-utils.cpp
 2012-08-18 09:00:43 +02:00
Jan Steemann b29d303488 fixed sporadically failing test 2012-08-15 12:43:20 +02:00
Jan Steemann 0d9cd02577 added test for journal size on startup 2012-08-14 11:53:06 +02:00
Jan Steemann 43b7ea951a issue #147: added --database.force-sync-shapes option 2012-08-09 19:25:39 +02:00
Jan Steemann 63524e0bae fixed documentation error 2012-08-09 17:50:01 +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 302339ce09 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2012-08-08 15:43:28 +02:00
Frank Celler 5e84fb02e8 added reference to caller 2012-08-08 15:32:54 +02:00
Jan Steemann 61ddc95a56 fixed memleak when wrong options were specified on command-line 2012-08-06 16:56:09 +02:00
Frank Celler aef20e2887 Merge branch 'master' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	Makefile.local
	arangod/Documentation/command-line-options.dox
	arangod/RestServer/ArangoServer.cpp
	build.sh
	html/admin/js/master.js
 2012-08-05 22:46:55 +02:00
Frank Celler 6ea7a4e626 added shutdown message in ps 2012-08-03 15:37:18 +02:00
Frank Celler 1ccd0677c5 fixed version number, added arangosh chapter 2012-08-03 10:22:09 +02:00
Frank Celler d7b2617348 fixed disable-admin-interface switch 2012-08-03 09:05:11 +02:00
Jan Steemann 853d8fca8e fixed compile error with --enable-zeromq 2012-08-01 11:01:58 +02:00
Jan Steemann 590855f633 made BatchJob and BatchSubjob template classes, fixed unittests 2012-07-31 11:00:05 +02:00
Jan Steemann 5c24872306 moved endpoint option parsing into ApplicationEndpointServer class 2012-07-30 15:50:34 +02:00
Jan Steemann 9d87988bf5 renamed ApplicationHttpServer to ApplicationEndpointServer 2012-07-30 08:26:16 +02:00
Jan Steemann 243aa0242c removed ApplicationHttpsServer 2012-07-27 15:59:58 +02:00
Jan Steemann 3b7b14454c added abstract EndpointServer, starting to combine ApplicationHttpServer and ApplicationHttpsServer 2012-07-27 15:38:27 +02:00
Jan Steemann c602be9ad2 added tests for ssl and unix socket endpoints 2012-07-27 10:47:03 +02:00
Jan Steemann daa6ca8b5e added documentation for ssl options 2012-07-26 13:39:21 +02:00
Jan Steemann 1f62715e87 fixed documentation 2012-07-26 12:49:25 +02:00
Jan Steemann eeeb78c2e7 Merge branch '1.1' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	CHANGELOG
	Installation/arangod.conf.in
	Makefile.in
	arangod/Makefile.files
	arangod/RestHandler/RestBatchHandler.cpp
	arangod/RestHandler/RestBatchHandler.h
	arangod/RestServer/ArangoServer.cpp
	bin/arango-password.in
 2012-07-26 12:03:03 +02:00
Jan Steemann cc9952f460 fixed documentation 2012-07-26 09:22:52 +02:00
Jan Steemann 7a0e9d350d added documentation for endpoints, disable-authentication, fixed tests 2012-07-26 09:10:59 +02:00
Jan Steemann 4f2229124f added --server.disable-authentication option 2012-07-26 08:49:56 +02:00
Jan Steemann ae47eb4da8 added documentation 2012-07-25 17:52:21 +02:00
Jan Steemann 8d8044ba47 added proper SSL support for arangosh and arangoimp 2012-07-25 17:47:54 +02:00
Frank Celler 97ff940736 fixed merge 2012-07-24 23:07:31 +02:00
Frank Celler 4605fbba9a Merge branch '1.1' of github.com:triAGENS/ArangoDB into 1.1 
Conflicts:
	CHANGELOG
	Doxygen/Examples.ArangoDB/startup1
	Makefile.in
	arangod/Documentation/command-line-options.dox
	arangod/Documentation/install-manual.dox
	arangod/Makefile.files
	arangod/RestServer/ArangoServer.cpp
	arangod/VocBase/auth.h
	arangosh/V8Client/arangosh.cpp
	html/admin/css/layout.css
	lib/Basics/ssl-helper.h
	lib/HttpServer/ApplicationHttpServer.cpp
	lib/HttpServer/ApplicationHttpServer.h
	lib/HttpServer/HttpServer.cpp
	lib/HttpsServer/ApplicationHttpsServer.cpp
	lib/HttpsServer/ApplicationHttpsServer.h
 2012-07-24 22:56:03 +02:00
Frank Celler 041eb53b10 Merge branch '1.0' of github.com:triAGENS/ArangoDB into 1.1 
Conflicts:
	Makefile.in
	arangod/RestServer/ArangoServer.cpp
	arangoirb/MRClient/arangoirb.cpp
	lib/GeneralServer/GeneralServer.h
	lib/HttpServer/ApplicationHttpServer.cpp
	lib/HttpServer/HttpCommTask.cpp
	lib/HttpServer/HttpHandler.cpp
	lib/HttpServer/HttpHandlerFactory.cpp
	lib/HttpServer/HttpHandlerFactory.h
	lib/HttpsServer/ApplicationHttpsServer.cpp
 2012-07-24 22:19:46 +02:00
Jan Steemann 537fb48aff allow admin interface via HTTPS 2012-07-24 09:48:13 +02:00
Jan Steemann a8cf75b245 minor cleanup 2012-07-24 08:43:38 +02:00
Jan Steemann 33839809ab ssl 2012-07-23 18:17:45 +02:00
Jan Steemann 9a72ea4496 added https@ and http@ endpoints, https still unfinished 2012-07-23 17:32:59 +02:00
Jan Steemann abc516f429 removed dead member variable 2012-07-23 16:00:12 +02:00
Jan Steemann 4e6c8024f6 added support for unix sockets, switched connection strings to endpoint syntax 2012-07-23 13:54:35 +02:00
Jan Steemann 53e8581b99 added ifdef around zeromq stuff 2012-07-20 15:07:53 +02:00
Jan Steemann 8cfba96f28 removed option --server.admin-port 2012-07-20 15:05:18 +02:00
Lucas Dohmen 17fd5f6afe Merge branch 'graph_algorithms' into devel 2012-07-18 16:41:27 +02:00
Jan Steemann 0b7ae1d728 moved options 2012-07-18 16:40:47 +02:00
Jan Steemann 73778300f1 moved options from help-admin to help-devel 2012-07-18 16:35:10 +02:00
Lucas Dohmen 83bd2af811 Merge branch 'devel' into graph_algorithms 2012-07-18 16:12:21 +02:00
Frank Celler 16407018d7 fixed relative paths 2012-07-16 13:45:13 +02:00
Jan Steemann 20ee770a91 removed batch handler in devel version 2012-07-16 09:44:16 +02:00
Frank Celler f7e1388e93 updated documentation 2012-07-15 17:31:59 +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 5ffff9edc4 added process title for supervisor 2012-07-11 10:46:04 +02:00
Frank Celler 58d29a78ef fixed privileges 2012-07-10 18:27:50 +02:00
Frank Celler e455348032 added --database.wait-for-sync 2012-07-10 16:34:06 +02:00
Frank Celler 08ff930154 Merge branch 'devel' of github.com:triAGENS/ArangoDB 2012-07-09 14:24:38 +02:00
Frank Celler 56bdef98b8 added ConnectionStatisticsHandler 2012-07-05 18:02:43 +02:00
Frank Celler c1892ff9b4 added doc for request statistics 2012-07-05 16:42:49 +02:00
Frank Celler 1fe03464c2 Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.1 2012-07-05 15:42:12 +02:00
Frank Celler 795b2a9178 added statistics 2012-07-04 18:33:13 +02:00
Jan Steemann 089ac79989 added server startup option --server.disable-admin-interface 2012-07-03 13:22:03 +02:00
Frank Celler 9e1acf7a75 yesterday 2012-07-02 18:47:12 +02:00
Frank Celler 0482963c7d Merge branch 'master' of github.com:fceller/ArangoDB into 1.1 2012-07-02 15:20:35 +02:00
Frank Celler fff2a9d656 cleanup mruby 2012-07-02 14:26:51 +02:00
Frank Celler 479cb7b8b8 fixed shutdown 2012-07-01 14:10:01 +02:00
Frank Celler d0459a0851 new HttpServer & co implementation 2012-07-01 11:17:16 +02:00
Frank Celler b0839ae8b1 fixed installtion paths 2012-06-30 11:12:06 +02:00
Oreste Panaia 43309908ec Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangod/BitIndexes/bitarray.c
	arangod/RestServer/ArangoServer.cpp
	configure
 2012-06-26 20:41:04 +08:00
Oreste Panaia 20bbdab435 Bitarray index first draft 2012-06-26 20:05:49 +08:00
Frank Celler 4e6f4a74a6 fixed memory leaks 2012-06-22 13:38:55 +02:00
Frank Celler d3c17ee43f fixed ruby console and actions, now using now ApplicationMR class 2012-06-22 11:00:21 +02:00
Frank Celler 23f5b3d12d removed JavascriptActionDispatcherThread 2012-06-22 08:17:12 +02:00
Frank Celler f5ca96f10d deleted JavascriptDispatcherThread.h 2012-06-22 08:09:09 +02:00
Frank Celler 5fbd731838 moved 2012-06-21 23:20:02 +02:00
Frank Celler 37d3ad8dc2 Merge branch 'devel' of github.com:triAGENS/ArangoDB 
Conflicts:
	Makefile.in
	arangod/RestServer/ArangoServer.cpp
	arangod/RestServer/JavascriptDispatcherThread.cpp
	lib/Dispatcher/DispatcherQueue.cpp
	lib/HttpServer/HttpCommTask.cpp
 2012-06-21 23:17:48 +02:00
Frank Celler b16d5e20ca fixed console 2012-06-21 23:02:12 +02:00
Frank Celler 94c954b8fd application v8 2012-06-21 22:40:11 +02:00
Jan Steemann 6a55a942fe potential fix for issue #111 (crash during make unittests) 2012-06-21 17:26:00 +02:00
Jan Steemann a0240aef31 renamed "shell" to "console" internally (as suggested by moonglum) 2012-06-21 16:39:22 +02:00
Jan Steemann f100e2ad82 changed async task handling 2012-06-21 16:32:54 +02:00
Frank Celler ea1243d3ce feature V8 2012-06-21 00:44:25 +02:00
Frank Celler 3fc8118904 cleanup ApplicationFeature 2012-06-20 20:52:15 +02:00
Frank Celler 0e7d6f8f2a added prepare and open 2012-06-19 23:20:33 +02:00
Frank Celler 8f16acdd86 added control to start & stop features 2012-06-19 22:12:49 +02:00
Frank Celler fffd1c4fc0 added log.filter 2012-06-19 17:30:08 +02:00
Frank Celler a10151c26a added handler factory 2012-06-19 16:26:51 +02:00
Frank Celler 54826adb83 cleanup HttpRequest as prep for ZeroMQ 2012-06-13 21:51:27 +02:00
Frank Celler 1364ea8019 Merge branch 'devel' of github.com:triAGENS/ArangoDB 2012-06-13 15:06:32 +02:00
Jan Steemann 5b61e2008b fixed potential segfault on shutdown 2012-06-13 14:12:53 +02:00
Jan Steemann c27ca78769 added documentation for _api/query and _api/explain 2012-06-13 14:08:27 +02:00
Jan Steemann 7ad822bd09 fixed documentation 2012-06-13 13:42:46 +02:00
Frank Celler 79449d5d71 Merge branch 'devel' of github.com:triAGENS/ArangoDB 
Conflicts:
	arangod/Ahuacatl/ahuacatl-grammar.c
 2012-06-13 11:40:35 +02:00
Frank Celler 3f5b54258b partial ZeroMQ integration 2012-06-13 11:39:00 +02:00
Frank Celler 11e2a51e78 alternative version if mruby supports define_method and attrib_reader 2012-06-12 17:33:27 +02:00
Frank Celler dd7fa848c0 alternative version if mruby supports define_method and attrib_reader 2012-06-12 17:28:53 +02:00
Frank Celler 0a17415a01 preparations for ZeroMQ, removed Scheduler and Dispatcher from ApplicationServer 2012-06-12 17:11:12 +02:00
Jan Steemann 2e0edb9a79 added #ifdef, otherwise compilation fails 2012-06-11 12:06:30 +02:00
Frank Celler 02517f81fa Merge branch 'devel' of github.com:triAGENS/ArangoDB 
Conflicts:
	Makefile.in
	arangod/Ahuacatl/ahuacatl-grammar.c
	arangod/Ahuacatl/ahuacatl-grammar.h
	arangod/RestServer/JavascriptDispatcherThread.cpp
 2012-06-10 21:26:43 +02:00
Frank Celler bb9253eeff fixed queue handling for MRuby, added mount for MRuby and mr_action_t 2012-06-09 11:15:18 +02:00
Jan Steemann efd48664ef Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	Ahuacatl/ahuacatl-statement-dump.c
	Ahuacatl/ahuacatl-statement-dump.h
	Ahuacatl/ahuacatl-statementlist.c
	Ahuacatl/ahuacatl-tree-dump.c
	Ahuacatl/ahuacatl-tree-dump.h
	Ahuacatl/ahuacatl-tree-walker.h
	Makefile.files
	Makefile.in
	arangod/Ahuacatl/ahuacatl-tree-dump.c
	arangod/Ahuacatl/ahuacatl-tree-dump.h
	arangod/Ahuacatl/ahuacatl-tree-walker.c
	arangod/Ahuacatl/ahuacatl-tree-walker.h
 2012-06-08 17:34:20 +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 efcfbccc7a the great rename IV 2012-06-08 15:25:16 +02:00
Frank Celler 313c3c31ed Merge branch '1.0' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangosh/V8Client/arangosh.cpp
 2012-06-08 15:13:01 +02:00
Frank Celler d2c758d663 the great rename 2012-06-08 15:01:25 +02:00