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

971 Commits

Author SHA1 Message Date
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
Frank Celler e83c1f09b4 WIP 2016-04-02 23:41:21 +02:00
Frank Celler 873f226b5f added SchedulerFeature 2016-04-01 12:52:28 +02:00
Frank Celler 068f9defd7 splitted HttpResponse.h 2016-04-01 10:39:38 +02:00
Frank Celler 486011d399 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-03-31 13:41:09 +02:00
Frank Celler 494bdca847 splitted HttpRequest into GeneralRequest/HttpRequest 2016-03-31 11:45:21 +02:00
Frank Celler 119c1bd44b Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-03-31 09:31:32 +02:00
Kaveh Vahedipour f8e49bd208 updating state to AQL 2016-03-30 15:59:13 +02:00
Kaveh Vahedipour d09986ca4b updating state to AQL 2016-03-30 13:42:29 +02:00
Frank Celler 02c7db250e added supervisor 2016-03-26 21:12:39 +01:00
Frank Celler ca53fb652e added options and validate for DaemonFeature 2016-03-25 22:59:06 +01:00
Frank Celler af00417cf4 skeleton arangod 2016-03-25 15:14:43 +01:00
jsteemann 1efc83babf Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-23 23:48:27 +01:00
jsteemann 8f4a3be165 cppcheck 2016-03-23 23:06:18 +01:00
Jan Steemann f670a07046 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-23 19:01:19 +01:00
Jan Steemann 9ac39b7ad6 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-23 16:36:30 +01:00
Kaveh Vahedipour d239fb8e7f merging into devel 2016-03-23 15:36:48 +01:00
Kaveh Vahedipour 7254ad4c9e Fixing issues 2016-03-23 15:16:47 +01:00
Frank Celler 86fe838a68 new logger 2016-03-22 21:09:48 +01:00
Kaveh Vahedipour 4a86d26f19 need to find out how to define the headers properly 2016-03-21 18:23:14 +01:00
Kaveh Vahedipour d6db18d655 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-03-18 10:45:15 +01:00
jsteemann 996299cea3 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-17 17:17:50 +01:00
jsteemann 4de93d49b9 added shebang support 2016-03-17 16:18:04 +01:00
jsteemann 3a6e618a30 micro optimizations 2016-03-15 12:28:58 +01:00
Jan Steemann 11d9451c8c Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-10 19:26:05 +01:00
Kaveh Vahedipour 61a55d61db Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-03-10 17:37:43 +01:00
Max Neunhoeffer 66a7f298da Remove RestEdgeHandler. 2016-03-10 11:29:24 +01:00
Frank Celler dd36dd55e6 fixes for windows 2016-03-10 09:25:54 +00:00
Kaveh Vahedipour 3a239fe1d5 Store intestinals into cpp file. Write to db ok. 2016-03-09 09:58:43 +01:00
Jan Steemann b393c3d9bb Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-09 09:42:10 +01:00
Frank Celler dfa9047484 switch arangosh to new ApplicationFeatures and ProgramOptions 2016-03-08 23:32:43 +01:00
Kaveh Vahedipour df56885c09 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-03-07 17:38:38 +01:00
Kaveh Vahedipour 1cb51b022a merging from devel 2016-03-07 17:38:34 +01:00
Jan Steemann 9f84b767d1 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-07 08:11:01 +01:00
Frank Celler 60cd363f19 moved build date to file build-date.h.in 2016-03-05 09:49:31 +01:00
Jan Steemann 4de5e41044 simplifications 2016-03-04 17:48:27 +01:00
Kaveh Vahedipour 2046a704e0 notifyall 2016-03-03 14:24:23 +01:00
Michael Hackstein 65cf9efefe Replaced another TRI_associative with a std::vector for Auth. Also replace TRI_vocbase_auth_cache_t by a proper CXX class VocbaseAuthCache. 2016-03-03 11:35:30 +01:00
Jan Steemann 1ca358bde8 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-02 15:21:37 +01:00
Jan Steemann 90bf212f54 fixed shutdown issues 2016-03-02 14:56:30 +01:00
Jan Steemann 92493f2807 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-02 11:04:58 +01:00
Frank Celler c88a68358d CMAKE changes for Windows and Solaris 2016-03-01 17:31:30 +01:00
Kaveh Vahedipour e5c79ea73c agency on 2016-02-27 11:44:21 +01:00
jsteemann 951c608ee6 cleanup 2016-02-26 23:20:41 +01:00
Kaveh Vahedipour 34976d462f agency on 2016-02-26 09:31:05 +01:00
Jan Steemann 3e82064770 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-25 14:59:08 +01:00
Frank Celler 37a0a7fc05 Merge branch 'devel' of github.com:arangodb/arangodb into solaris 2016-02-25 10:56:14 +01:00
Jan Steemann 8f2e2de451 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-25 10:46:13 +01:00
jsteemann 1823ae4fd2 removed unused forwards and functions 2016-02-25 00:48:06 +01:00
jsteemann 74fa6cf207 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-25 00:02:03 +01:00
jsteemann 851d19a9d6 logging simplifications 2016-02-25 00:00:18 +01:00
Jan Steemann 5ee8493c39 cleanup 2016-02-24 19:51:12 +01:00