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

1122 Commits

Author SHA1 Message Date
Michael Hackstein e22014a272 Merge branch 'MIT' of github.com:arangodb/arangodb into generic-col-types 2016-09-06 09:33:23 +02:00
jsteemann 5524b25800 removed VocbaseCollectionInfo 2016-09-02 09:41:36 +02:00
jsteemann 29170414a2 removed unused property 2016-09-01 10:40:29 +02:00
jsteemann fa21e70256 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-31 17:59:54 +02:00
jsteemann 89ac2dfba5 don't leak on help 2016-08-31 14:28:23 +02:00
jsteemann a04934ce50 Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-31 09:25:09 +02:00
Jan Christoph Uhde ed111a39a1 Merge branch 'devel' into obi-velocystream-try-merge-devel 
* devel: (24 commits)
  minor fixes
  fix effect that on second install we will complain about mismatching passwords
  only test for cleaning up 3rdparty if we're parametrized to do so.
  fix CMake so it finds the PythonInterpreter even with oder versions
  hexify corrupted markers
  Fix comments
  fixed cluster start
  issue #2022: double max allowed request body size, cap --batch-size value in arangoimp
  fixed issue #2023: added replicationFactor to docs
  improve the perf script
  fix perfsetupscript
  clean up perf script
  add SYSTEM flag to boost includes to avoid warnings
  Adding Foxx access to agency
  Adding Foxx access to agency
  fix compile warning
  Add missing windows library.
  fix windows compile problems.
  Fix syntax error in windows client installer.
  If we have relative paths that are working, make them absolute so they still work after CWD's of arangod
  ...

Conflicts:
	arangod/Agency/AgentConfiguration.cpp
	arangod/GeneralServer/HttpCommTask.cpp
	arangod/RestServer/DatabaseFeature.cpp
	arangod/VocBase/datafile.cpp
 2016-08-30 22:04:31 +02:00
jsteemann bdd9d1422e bugfixes 2016-08-30 13:45:54 +02:00
jsteemann bd590fb62d Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-30 08:18:34 +02:00
Kaveh Vahedipour c53428ce89 minor fixes 2016-08-29 17:13:33 +02:00
jsteemann 37258adb57 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-26 16:37:25 +02:00
Kaveh Vahedipour e07543c2e2 Adding Foxx access to agency 2016-08-26 16:25:03 +02:00
jsteemann f4aa60ed0d Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-25 10:38:26 +02:00
Wilfried Goesgens 4939e02fb2 Make the existance of the database directory non-mandatory again. 2016-08-25 10:07:37 +02:00
jsteemann 07055384b8 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-24 17:34:59 +02:00
Wilfried Goesgens 1f162ac882 Implement scheme to more clever pass the directories from the build process to the run-time 
We will now try to evaluate the toplevel install directory from the configured binary dir.
We will use this toplever directory when searching for other directories.
 2016-08-24 14:45:08 +02:00
jsteemann fb4b3d0a3c Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into readcache 2016-08-24 11:07:45 +02:00
jsteemann 7794b76b33 intermediate commit 2016-08-24 10:54:47 +02:00
jsteemann b29103c1f1 fix collector inactivity in shutdown 2016-08-24 09:37:47 +02:00
Jan Christoph Uhde 1febeadfd7 finish ResponseCode enum 2016-08-23 15:46:42 +02:00
Jan Christoph Uhde d3654d99d8 finish RequestType enum 2016-08-23 14:49:29 +02:00
Jan Christoph Uhde e1e7e2da0b Merge remote-tracking branch 'origin/engine-vs-velocystream' into obi-velocystream-merge 
* origin/engine-vs-velocystream: (91 commits)
  removed useless include
  removed JsonParser
  removed JsonHelper
  Fixed another failed nullptr handling in LogicalCollection cluster case.
  Fixed undefined behaviour in rest error creation
  Implemented updated of LogicalCollectionInfo. Right now this is only used in Cluster Mode
  agency startup changed to bootstrapping
  Mention howto control core files on linux.
  shutdown fixed
  Removed create / drop system collection from Cluster test. This is forbidden now
  The logical colleciton now knows it's journalSize
  Fixed a bug in collectionNameResolver. It now returns cid 0 for not found collections in cluster again.
  pushing corrected unittest script and cluster startup scripts
  adjusting startup scripts
  missing source file added
  we have a bootstrapping agency
  votes are processed correctly again
  Add module.context.createDocumentationRouter
  Don't implicitely build the windows packages.
  remove debug print
  ...

Conflicts:
	arangod/Cluster/ClusterComm.cpp
	arangod/GeneralServer/VppCommTask.h
	arangod/RestHandler/RestBaseHandler.cpp
	lib/Rest/VppRequest.h
 2016-08-19 14:35:05 +02:00
Jan Christoph Uhde 3a9867f86d merge with frank 2016-08-19 10:00:43 +02:00
Frank Celler aed99f6b53 fixed ownership of handler 2016-08-18 23:06:36 +02:00
Michael Hackstein efce89e3f4 Fixed database/collection lookup in cluster. It did not get the correct vocbase when using a Database other than _system 2016-08-18 17:39:25 +02:00
jsteemann b2cb551685 moved functionality from vocbase into DatabaseFeature 2016-08-18 09:24:26 +02:00
jsteemann 4f1384b948 remove unnecessary string conversions 2016-08-15 15:58:51 +02:00
jsteemann 5d640b7144 fixed tests 2016-08-04 13:32:54 +02:00
jsteemann dd30b47b9d make _state private 2016-08-02 15:31:55 +02:00
jsteemann 9677210e57 refactoring 2016-08-02 15:00:25 +02:00
jsteemann f1596fa459 refactoring 2016-08-02 14:01:04 +02:00
jsteemann 3664511e36 privatize vocbase methods 2016-08-02 13:49:22 +02:00
jsteemann 788922f55a some fixes 2016-08-01 17:16:23 +02:00
Michael Hackstein 994a99e31f Merge branch 'devel' of github.com:arangodb/arangodb into MIT 2016-08-01 16:50:54 +02:00
jsteemann 71bd7deace Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-01 09:04:17 +02:00
Frank Celler 51683dbda0 added a panic interrupt of memory gets low 2016-07-31 12:58:27 +02:00
jsteemann d92f15aeed entirely removed TRI_document_collection_t 2016-07-29 17:48:51 +02:00
jsteemann 80f1a7aaee Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-29 17:16:20 +02:00
Andreas Streichardt 526c8f42c2 Fix foxx issues in cluster 
Bootstrap will now be done on the bootstrap coordinator.

queues will now be executed by the "foxxmaster"
 2016-07-29 16:06:31 +02:00
jsteemann b48779c821 fixed tests 2016-07-28 15:56:38 +02:00
jsteemann 329b733090 moved dropCollection into TRI_vocbase_t 2016-07-28 13:14:12 +02:00
jsteemann b71e12f6a0 some vocbase refactoring 2016-07-28 11:06:21 +02:00
jsteemann cc5eaea09c Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-28 09:10:17 +02:00
Frank Celler 24db83573a added thread affinity for MacOSX 2016-07-27 22:29:59 +02:00
jsteemann 5d6cd9ef71 moved query id generation 2016-07-27 17:44:31 +02:00
jsteemann 10a60b5458 refactoring 2016-07-27 15:40:25 +02:00
jsteemann 26ce0c6936 some collection handling refactoring 2016-07-27 13:12:26 +02:00
Michael Hackstein 3dac8c27ed Implemented infrastructure for the TraversalEngines. We can now create and delete these engines accross several requests/threads. Right now the engines are empty. 2016-07-27 10:08:45 +02:00
jsteemann 89e0c11b44 refactoring 2016-07-26 16:25:38 +02:00
jsteemann df4daf4122 CleanupThread is now derived from Thread 2016-07-26 12:54:08 +02:00
Michael Hackstein 1d6afd1c67 Created a TraverserEngineRegistry which is a singleton feature. Right now it is empty. TODO Implement functionallity 2016-07-26 11:29:12 +02:00
jsteemann 9af8a30a36 fixed compactor locks 2016-07-26 10:22:44 +02:00
jsteemann 253cb173a9 cleanup compaction responsibility a little bit 2016-07-26 07:34:02 +02:00
jsteemann 2aa2e0dab4 removed server.h 2016-07-25 16:49:52 +02:00
jsteemann 50f3dcfb3f cleanup 2016-07-25 16:16:07 +02:00
jsteemann a0f0055b6f moved all database management functions into DatabaseFeature 2016-07-25 15:48:37 +02:00
jsteemann 33c94e5041 moved database lookup functions into DatabaseFeature 2016-07-25 14:56:39 +02:00
jsteemann b288d3e4dd moved dropDatabaseCoordinator() into DatabaseFeature 2016-07-25 14:04:55 +02:00
jsteemann de6d7182c8 move deletion of databases into DatabaseFeature 2016-07-25 13:56:34 +02:00
jsteemann e8a5b5ccf5 move createDatabase into DatabaseFeature 2016-07-25 12:35:53 +02:00
jsteemann a92ac7be28 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-25 11:14:44 +02:00
Frank Celler a92add0a9f renamed RestServerFeature to GeneralServerFeature 2016-07-23 14:16:10 +02:00
jsteemann 95462e7796 moved database creation in DatabaseFeature 2016-07-22 17:43:22 +02:00
jsteemann 5993c1b094 refactoring 2016-07-22 15:46:45 +02:00
jsteemann 6c2d927e01 refactoring 2016-07-22 15:44:23 +02:00
jsteemann dfa2e59c4a don't access nullptr 2016-07-22 14:14:50 +02:00
jsteemann e55070dcd2 starting again... well, at least in some configuration 2016-07-22 14:03:03 +02:00
jsteemann 431262cc19 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-21 16:42:47 +02:00
Jan Christoph Uhde 5edaf0043a preparations for velocystream completed 2016-07-21 09:32:00 +02:00
jsteemann b9529d80e3 moved functionality into engine 2016-07-20 17:26:58 +02:00
jsteemann e36770efdf moved functionality 2016-07-20 16:25:41 +02:00
jsteemann ca1da8fd4a moved functionality from TRI_server_t into DatabaseFeature 2016-07-20 16:09:12 +02:00
jsteemann 5ee344b685 added greetings feature 2016-07-18 18:32:27 +02:00
jsteemann 8cf7fc889d renamed method 2016-07-18 18:07:11 +02:00
jsteemann 8313682b2c refactoring 2016-07-18 17:48:24 +02:00
jsteemann 53f77017fb moved SERVER away from DatabasePathFeature 2016-07-18 17:33:11 +02:00
jsteemann b005ba61fe removed unused method 2016-07-18 17:20:31 +02:00
jsteemann 2dab54a751 removed a define 2016-07-18 17:15:41 +02:00
jsteemann f373a2c327 removed TRI_vocbase_defaults_t 2016-07-18 16:55:25 +02:00
jsteemann 904868d996 renamed DatabaseServerFeature to DatabasePathFeature 2016-07-18 15:41:10 +02:00
jsteemann 073cfb15e7 moved index threads into a feature of its own 2016-07-18 15:23:25 +02:00
jsteemann 807f287868 moved server id detection and pagesize detection into their own features 2016-07-18 14:37:12 +02:00
jsteemann b9b01b4c77 always flush log in case of exception 2016-07-18 11:44:14 +02:00
jsteemann 30d32bb70e factored out lock-file handling into LockFileFeature 2016-07-15 14:44:06 +02:00
jsteemann 7742e709a3 storage engine selection at server start 2016-07-15 12:26:40 +02:00
Frank Celler 38a55ed13c Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-07-04 17:09:40 +02:00
Wilfried Goesgens dd5e2b1c1b Fix warning message - the algorithm adds dashes, no need to do this here. 2016-06-23 13:15:50 +02:00
Jan Steemann a00cdb8cfd define RESTSERVER earlier, to avoid false results 2016-06-21 09:52:04 +02:00
Andreas Streichardt 76b89776fb Allow aborting cluster task startup...CTRL-C will now do a hard abort during startup 2016-06-16 16:00:43 +02:00
Frank Celler e8a5f4b8aa fixed random issue 2016-06-14 14:25:44 +02:00
Frank Celler 37dc4ae54e fixed random issue 2016-06-14 14:22:43 +02:00
Frank Celler 4576ec4f5c fixed return code 2016-06-13 17:20:17 +02:00
Frank Celler ed01dcec8f secure-installation will remove all users except root 2016-06-12 12:19:37 +02:00
Max Neunhoeffer 96053268aa Fix v8 contexts check. 2016-06-10 15:48:38 +02:00
Frank Celler fa9501cc0c use defer release 2016-06-10 14:01:42 +02:00
Frank Celler 5cb1d86d58 special treament for /_api/user 2016-06-10 14:01:42 +02:00
Frank Celler f029808e4e added restore-admin 2016-06-09 15:28:27 +02:00
Jan Steemann 3712a8dcf4 oops, forgot to add these files too 2016-06-09 11:09:54 +02:00
Frank Celler a92d566234 added database.init-database 2016-06-08 21:40:21 +02:00
jsteemann 36e18893d6 removed some unused Windows code remainders 2016-06-07 23:08:18 +02:00
Frank Celler 69e254d28a trying to fix cleanup 2016-06-06 23:53:53 +02:00
Frank Celler 16c6c2087d added unprepare 2016-06-06 18:27:51 +02:00
Max Neunhoeffer 78636aabe5 Fixed a crash in RestServerFeature::getJWTSecret. 2016-06-06 15:48:06 +02:00
Jan Steemann 93f404b037 updated documentation 2016-06-03 17:24:12 +02:00
Wilfried Goesgens 6ffc619eee Publish variables 2016-06-03 16:34:10 +02:00
Wilfried Goesgens 2a06316ae6 Add servicemain back. 2016-06-03 16:28:12 +02:00
Andreas Streichardt 2d0c661f81 change default to system-only so foxxes are useable 2016-06-03 16:15:36 +02:00
Frank Celler 8da37f59eb switch to RandomGenerator 2016-06-03 13:30:28 +02:00
Jan Steemann 6412200f27 added /_api/aql-builtin 2016-06-03 12:56:18 +02:00
Frank Celler ee98b59e2f changed reload to outdated 2016-06-03 10:38:47 +02:00
Andreas Streichardt 465252e415 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-06-02 19:51:47 +02:00
Andreas Streichardt 0129e968df Fix authentication_parameters 2016-06-02 19:51:38 +02:00
Wilfried Goesgens 8502bfa4d3 Refactor windows service infrastructure 2016-06-02 18:30:23 +02:00
jsteemann a9451e09d9 removed now-invalid asserts 2016-06-02 17:35:36 +02:00
Andreas Streichardt a3d5ce8d16 Merge remote-tracking branch 'origin' into jwt 2016-06-02 14:45:21 +02:00
Andreas Streichardt 1084d4c14a Fix jwt authentication 2016-06-02 14:44:19 +02:00
jsteemann b247a6e08c added --hund option 2016-06-02 13:54:53 +02:00
Frank Celler 397623460e WIP 2016-06-02 09:49:36 +02:00
Frank Celler b476122344 added use database 2016-06-02 09:28:37 +02:00
Frank Celler 22b454800d WIP 2016-06-01 23:03:00 +02:00
Andreas Streichardt 021b71a7c1 Frontend is working 2016-06-01 17:51:39 +02:00
Frank Celler 1e25e5d262 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH 
Conflicts:
	arangod/Cluster/HeartbeatThread.cpp
	arangod/RestServer/RestServerFeature.cpp
 2016-06-01 16:25:13 +02:00
Frank Celler 3e61cb433d WIP 2016-06-01 15:57:28 +02:00
Frank Celler 963449d5f7 WIP 2016-06-01 13:37:13 +02:00
Andreas Streichardt ba14069f93 Merge branch 'devel' into jwt 2016-06-01 12:10:12 +02:00
Max Neunhoeffer 0cb9441912 First Bootstrap, then AgencyFeature. 2016-05-31 12:44:19 -06:00
Max Neunhoeffer fbd03bd52b Only start ConsoleFeature after BootstrapFeature. 2016-05-31 12:39:13 -06:00
Max Neunhoeffer 61a812662a Only start UnitTestFeature after BootstrapFeature. 2016-05-31 12:38:52 -06:00
Andreas Streichardt 9178e560eb Implement jwt tests 2016-05-31 19:19:10 +02:00
Andreas Streichardt b5f27100b1 oops...JWT should be uppercase in header 2016-05-31 17:22:28 +02:00
Andreas Streichardt 66ed7b37f5 Verify jwt token 2016-05-31 17:03:45 +02:00
Andreas Streichardt 87f09b986a Compiles 2016-05-31 14:28:15 +02:00
Andreas Streichardt 6cb00f905d Merge branch 'devel' into jwt 2016-05-30 18:49:26 +02:00
Andreas Streichardt 5b0055bfbf jwt generation works 2016-05-30 18:47:04 +02:00
Andreas Streichardt 84a7213755 Add jwtsecret 2016-05-30 14:48:35 +02:00
Andreas Streichardt 1cb973ea1f Current work 2016-05-27 11:02:42 +02:00
Max Neunhoeffer c0d4118888 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-05-25 22:22:48 +02:00
jsteemann fd1e7f0944 friendlier error message when using a renamed option 2016-05-25 21:45:53 +02:00
Max Neunhoeffer 9b8f9f22e9 Let bootstrap feature publish its readiness. 2016-05-25 17:29:34 +02:00
Jan Steemann 43826ced5c some fixes for issues discovered during tests 2016-05-24 18:53:42 +02:00
Frank Celler c441700c20 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-05-22 21:45:40 +02:00
Frank Celler af0b0900af WIP 2016-05-22 21:08:37 +02:00
Frank Celler 806fce1dec WIP 2016-05-21 21:58:42 +02:00
jsteemann 2ed62d324a test fix 2016-05-19 15:24:45 +02:00
jsteemann 51d4e470be fixed async requests 2016-05-19 14:53:41 +02:00
Andreas Streichardt d84e60108c move proxy thing into different section as it is only relevant for the frontend right now 2016-05-19 10:39:59 +02:00
Andreas Streichardt 04caecaeb0 Merge branch 'add-js-server-functions' into devel 2016-05-18 15:36:47 +02:00
jsteemann 78f22678f4 don't disable the SSL feature with the RestServer feature but the SSL-Server feature 2016-05-18 00:22:55 +02:00
Andreas Streichardt d695743df2 Add proxy check 2016-05-17 20:23:47 +02:00
jsteemann 11f2afad44 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-12 00:00:37 +02:00
jsteemann d4cb93fb9c added TYPENAME() and HASH() functions 2016-05-11 23:54:00 +02:00
Frank Celler 0117a38260 fixed ssl init 2016-05-11 18:07:45 +02:00
Frank Celler bf16086623 moved SSL files into separate directory 2016-05-11 16:34:03 +02:00
jsteemann 3f1516eca7 bugfixes 2016-05-11 15:01:06 +02:00
Max Neunhoeffer f41ab22098 Change a few startup messages from level INFO to DEBUG. 2016-05-11 11:42:33 +02:00
jsteemann 0ce8599598 fixes for MSVC 2016-05-10 19:01:21 +02:00
jsteemann 9561720ed6 global try...catch for all client tools 2016-05-10 17:02:06 +02:00
jsteemann 30525fccee use StaticStrings 2016-05-10 17:01:34 +02:00
Max Neunhoeffer 39ecd9fd13 Rename prefix and prefixStripped in AgencyComm. 2016-05-10 16:00:07 +02:00
Max Neunhoeffer 825f010980 Rename getValues2 to getValues. 2016-05-10 15:52:54 +02:00
Max Neunhoeffer 6c37027b49 Get rid of an AgencyComm::getValues. 2016-05-09 13:41:19 +02:00
Jan Steemann 0bd61cf928 removed option `--server.default-api-compatibility` 2016-05-06 18:38:37 +02:00
jsteemann 1a4a95a2ad notify queries about shutdown 2016-05-06 10:20:00 +02:00
jsteemann 495b266c8a initial commit 2016-05-03 15:42:24 +02:00
Max Neunhoeffer b9e935b928 At bootstrap: Only leave maintenance mode if things are initialized. 2016-05-02 13:52:46 +02:00
jsteemann abd13fea06 fix initialization 2016-05-01 00:08:12 +02:00
jsteemann 1250fcf63e micro optimizations 2016-05-01 00:03:23 +02:00
Max Neunhoeffer 18b72dfdbe Fix cluster startup. 2016-04-29 16:36:41 +02:00
Max Neunhoeffer 017d4a56a7 Better logging. 2016-04-29 14:45:27 +02:00
Max Neunhoeffer 84d7616cde Better logging. 2016-04-29 14:25:33 +02:00
Max Neunhoeffer 0f981b560d Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-29 13:59:30 +02:00
Max Neunhoeffer b05464b78c Cluster bootstrap revolution. 2016-04-29 13:59:12 +02:00
Frank Celler 1369ad3a6f towards windows service 2016-04-29 11:14:57 +02:00
jsteemann 7974b2bc42 small changes 2016-04-29 01:01:49 +02:00
Frank Celler 0f541f6ec3 fixed namespace 2016-04-28 19:17:38 +02:00
jsteemann b8ba262a10 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-27 22:54:38 +02:00
jsteemann cd45a52ba5 attempt to finish startup order 2016-04-27 22:54:29 +02:00
Frank Celler 19720b166d script and unittests are features 2016-04-27 22:28:21 +02:00
Frank Celler 41b765ad76 added ScriptFeature 2016-04-27 22:04:57 +02:00
jsteemann bfd6fa833d disallow thread creation until ApplicationServer::start() 2016-04-27 16:17:46 +02:00
jsteemann 22a1c0bb08 use method 2016-04-27 13:08:24 +02:00
jsteemann 7472aca387 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-27 12:17:53 +02:00
Frank Celler 4d66f69fb3 added --uid and --gid 2016-04-27 12:08:16 +02:00
jsteemann d62143ce83 make boolean command-line parameters optional 2016-04-27 11:37:42 +02:00
jsteemann fbd254bf22 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-26 23:30:47 +02:00
jsteemann a596445e1b fixed feature order 2016-04-26 23:23:34 +02:00
jsteemann 1832670e8f global exception catch block 2016-04-26 23:23:06 +02:00
Frank Celler 33c96bea86 added application/x-velocypack 2016-04-26 23:01:36 +02:00
Jan Steemann 866f858acc try to fix some startup confusion 2016-04-26 17:45:18 +02:00
Jan Steemann e65722ff35 documentation for changed startup options 2016-04-26 13:21:25 +02:00
jsteemann c0172fe74b use make_shared 2016-04-26 00:02:51 +02:00
Jan Steemann c8c8625727 try to fix some undefined behavior on cluster startup 2016-04-25 15:31:23 +02:00
jsteemann 67a0bafbaa fix options 2016-04-24 21:06:09 +02:00
jsteemann 4b7e0a72d0 moved --version into a feature of its own 2016-04-24 18:42:59 +02:00
jsteemann 58198a834e re-added options for foxx queues 2016-04-24 15:27:08 +02:00
jsteemann dcc5825f93 cleaned up features a bit 2016-04-24 14:29:29 +02:00
Frank Celler 7f35ddc22b fixed assert 2016-04-23 19:55:43 -07:00
Frank Celler 6a9434d6cf fixed assert 2016-04-23 19:29:26 -07:00
Frank Celler c46eb8e65e added LogfileManager as feature 2016-04-23 16:34:57 -07:00
Jan Steemann 104e8e8b9b remove ArangoServer.h remainders 2016-04-22 20:18:28 +02:00
Jan Steemann 38e543e0a8 cppcheck 2016-04-22 15:51:03 +02:00
Jan Steemann e3db1236c6 fixed compile warnings 2016-04-22 15:31:47 +02:00
Jan Steemann 7d6994862e fixed startup/shutdown with specific features 2016-04-22 14:44:42 +02:00
Jan Steemann f603808f88 fixed V8 leaks 2016-04-22 14:10:23 +02:00
Jan Steemann 119f53c7a3 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-22 13:02:29 +02:00
Jan Steemann 143c2378af fixed leak 2016-04-22 13:01:32 +02:00
jsteemann 366cb659af fixed wrong options 2016-04-22 12:36:58 +02:00
jsteemann 99e30dc6a3 fix statistics 2016-04-22 09:29:09 +02:00
Frank Celler 5335a5b0af moved to Random 2016-04-21 22:53:20 -07:00
Frank Celler ac3a9883b9 restored log buffer feature 2016-04-21 21:07:23 -07:00
jsteemann 257663d017 removed unused file 2016-04-21 19:35:35 +02:00
jsteemann 4a87925b41 fixed cluster start 2016-04-20 17:36:39 +02:00
Max Neunhoeffer eacd5f504a Add dependency of features. 2016-04-20 14:16:48 +02:00
Max Neunhoeffer 7a12918021 Fix agency startup. Agency not yet working. 2016-04-20 12:25:13 +02:00
jsteemann ef027dabaf added missing handler 2016-04-20 10:34:05 +02:00
Frank Celler 007fe8e053 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH 
Conflicts:
	arangod/Agency/Constituent.cpp
	arangod/Agency/RestAgencyHandler.cpp
	arangod/Aql/Query.cpp
	arangod/Aql/grammar.cpp
	arangod/RestHandler/RestSimpleQueryHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	js/client/modules/@arangodb/testing.js
 2016-04-19 07:44:00 +02:00
Kaveh Vahedipour 1221326753 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-18 13:08:56 +02:00
Kaveh Vahedipour 76a0b2d41a cluster startup and supervision 2016-04-18 13:08:49 +02:00
Frank Celler 17cd890132 WIP 2016-04-16 20:29:33 -07:00
Frank Celler cf416c686c WIP 2016-04-16 18:44:10 -07:00
Frank Celler 9de6e8ec6d fixed error message 2016-04-17 00:02:00 +02:00
Frank Celler f40f87155a WIP 2016-04-15 23:04:32 -07:00
Frank Celler f7249d2729 WIP 2016-04-15 22:47:35 -07:00
Frank Celler 2dd798cd48 WIP 2016-04-15 22:09:55 -07:00
Frank Celler dd44191a91 WIP 2016-04-15 21:03:53 -07:00
Frank Celler cd91d3654e Merge remote-tracking branch 'origin' into FMH 2016-04-15 19:01:38 -07:00
Michael Hackstein 0e2d31f633 Moved GET _api/document?collection=xxx to PUT _api/simple/all-keys {collection: xxx}. Adapted all tests. Also removed Transaction::allKeys which got obsolete by this commit. 2016-04-15 11:23:25 +02:00
Frank Celler 8254bd4bd6 WIP 2016-04-14 21:32:12 -07:00
Frank Celler b2b5fbb62d WIP 2016-04-14 14:02:07 -07:00
Frank Celler 0fa6435731 WIP 2016-04-13 21:12:16 +02:00
Kaveh Vahedipour d247e7a3bd mop is fixing the cluster load 2016-04-13 15:36:11 +02:00
Andreas Streichardt 4c27442bd9 Implement callbacks 2016-04-13 14:05:15 +02:00
Frank Celler 3f9dd62d4c WIP 2016-04-13 12:30:18 +02:00
jsteemann 96d96ca977 always load agency data, regardless of startup mode 2016-04-13 12:20:24 +02:00
Frank Celler dc3e8e6bdb WIP 2016-04-12 20:27:46 +02:00
Frank Celler 922753ef3d WIP 2016-04-11 17:44:41 +02:00
Frank Celler 3d2cc31306 WIP 2016-04-11 00:05:37 +02:00
Frank Celler 1b7c47c6bc added --console 2016-04-10 13:47:53 +02:00
Jan Steemann 51a825cb17 removed HTTP calls 2016-04-08 16:07:16 +02:00
Frank Celler d24f63e8e2 added upgrade feature 2016-04-08 15:39:36 +02:00
Frank Celler 58b9cf7e91 WIP 2016-04-07 15:40:11 +02:00
Jan Steemann 9f8c24b1cd Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-04-06 15:43:27 +02:00
Frank Celler 31d477477e WIP 2016-04-04 15:52:14 +02:00
Frank Celler de8059a97b use unique_ptr 2016-04-04 15:42:59 +02:00
Frank Celler 5cab4cffac WIP 2016-04-04 15:23:25 +02:00
Kaveh Vahedipour 062a759bca Merge branch 'agency' of https://github.com/arangodb/arangodb into devel 2016-04-04 12:13:48 +00:00
Kaveh Vahedipour 67e6e403e3 agency's own endpoint is now derived from server.endpoint 2016-04-04 11:28:48 +02:00
Frank Celler 6002ede1c4 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-03 21:46:30 +02:00
Frank Celler f2134fc0a0 WIP 2016-04-03 20:19:12 +02:00
Frank Celler 09da78e444 WIP 2016-04-03 13:48:25 +02:00