Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #6467 from vespa-engine/henrhoi/es_vespa_parser | Henrik Høiness | 2018-07-30 | 1 | -0/+222 |
|\ | | | | | henrhoi/es_vespa_parser | ||||
| * | Added arg --application_name, now creating folder for searchdefs ++ | Henrik | 2018-07-26 | 1 | -63/+55 |
| | | |||||
| * | Added description, example of usage and author | Henrik | 2018-07-25 | 1 | -1/+5 |
| | | |||||
| * | Created parser that takes in ES-documents and ES-mapping and parses them ↵ | Henrik | 2018-07-25 | 1 | -0/+226 |
| | | | | | | | | into Vespa-documents | ||||
* | | Merge pull request #6486 from vespa-engine/arnej/splunk-start-options | Tor Brede Vekterli | 2018-07-27 | 1 | -11/+18 |
|\ \ | | | | | | | add more "just do it" option to splunk start | ||||
| * | | forgot terminating nullptr | Arne Juul | 2018-07-27 | 1 | -0/+1 |
| | | | |||||
| * | | refactor to accept any number of args | Arne Juul | 2018-07-27 | 1 | -11/+17 |
| | | | |||||
| * | | add more "just do it" option to splunk start | Arne Juul | 2018-07-27 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #6487 from ↵ | Henning Baldersheim | 2018-07-27 | 9 | -19/+176 |
|\ \ \ | |/ / |/| | | | | | | | | vespa-engine/toregge/add-proton-disk-layout-skeleton Add skeleton for proton disk layout, to better handle removal of | ||||
| * | | Rename method according to review feedback. | Tor Egge | 2018-07-27 | 5 | -9/+7 |
| | | | | | | | | | | | | Remove unneeded guard checks. | ||||
| * | | Add skeleton for proton disk layout, to better handle removal of | Tor Egge | 2018-07-27 | 9 | -19/+178 |
|/ / | | | | | | | unused directories in proton directory tree. | ||||
* | | Merge pull request #6483 from vespa-engine/balder/add-getSortedHeapHits | Henning Baldersheim | 2018-07-26 | 3 | -91/+108 |
|\ \ | | | | | | | Balder/add get sorted heap hits | ||||
| * | | Simplify since reRank i snot incremental. | Henning Baldersheim | 2018-07-26 | 1 | -8/+4 |
| | | | |||||
| * | | Split reRank in 2 where one is using the other for later reuse. | Henning Baldersheim | 2018-07-26 | 2 | -2/+14 |
| | | | |||||
| * | | Add test for getSortedHeapHits | Henning Baldersheim | 2018-07-26 | 1 | -2/+13 |
| | | | |||||
| * | | Fix up clang-tidy warnings | Henning Baldersheim | 2018-07-26 | 1 | -64/+56 |
| | | | |||||
| * | | Add getSortedHeapHits | Henning Baldersheim | 2018-07-26 | 2 | -21/+27 |
|/ / | |||||
* | | Merge pull request #6480 from vespa-engine/arnej/abi-compat | Morten Tokle | 2018-07-26 | 1 | -3/+7 |
|\ \ | | | | | | | preserve binary compatibility | ||||
| * | | preserve binary compatibility | Arne Juul | 2018-07-26 | 1 | -3/+7 |
| | | | |||||
* | | | Merge pull request #6479 from vespa-engine/balder/refactor-diversity-for-reuse | Henning Baldersheim | 2018-07-26 | 5 | -143/+185 |
|\ \ \ | | | | | | | | | Balder/refactor diversity for reuse | ||||
| * | | | Restructure for code reuse and hiding implementation. | Henning Baldersheim | 2018-07-26 | 5 | -164/+150 |
| | | | | |||||
| * | | | Restructure for code reuse and hiding implementation. | Henning Baldersheim | 2018-07-26 | 1 | -0/+16 |
| | | | | |||||
| * | | | Make diversifier virtual for easier reuse and minimal runtime impact. | Henning Baldersheim | 2018-07-26 | 2 | -42/+50 |
| | | | | |||||
| * | | | No need for templated argument anymore | Henning Baldersheim | 2018-07-26 | 1 | -23/+34 |
| | | | | |||||
| * | | | Split in filter and recorder for reuse. | Henning Baldersheim | 2018-07-26 | 1 | -18/+39 |
| |/ / | |||||
* | | | Merge pull request #6368 from vespa-engine/bjorncs/move-athenz-principal-filter | Bjørn Christian Seime | 2018-07-26 | 5 | -86/+85 |
|\ \ \ | | | | | | | | | Move AthenzPrincipalFilter to jdisc-security-filters | ||||
| * | | | Move AthenzPrincipalFilter to jdisc-security-filters | Bjørn Christian Seime | 2018-07-26 | 5 | -86/+85 |
| | | | | |||||
* | | | | Merge pull request #6469 from ↵ | Tor Brede Vekterli | 2018-07-26 | 129 | -365/+386 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | vespa-engine/vekterli/remove-dangerous-stringref-c_str-function Remove dangerous stringref::c_str() | ||||
| * | | | Don't string wrap refs that are guaranteed to be zero-terminated | Tor Brede Vekterli | 2018-07-26 | 9 | -11/+12 |
| | | | | |||||
| * | | | Remove stringref::c_str() | Tor Brede Vekterli | 2018-07-25 | 128 | -365/+385 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The expected semantics of c_str() (a null-terminated string) cannot be satisfied with a string reference, so remove the function entirely to prevent people from using it in buggy ways. Replaces c_str() with data() in places where it is presumed safe, otherwise constructs temporary string instances. Certain callsites have been de-stringref'd in favor of regular strings, in particular where C APIs have been transitively called. The vast majority of these were called with string parameters anyway, so should not cause much extra allocation. | ||||
* | | | | Merge pull request #6478 from vespa-engine/balder/random-deinline-and-some-more | Henning Baldersheim | 2018-07-26 | 5 | -9/+10 |
|\ \ \ \ | | | | | | | | | | | Balder/random deinline and some more | ||||
| * | | | | Add final | Henning Baldersheim | 2018-07-26 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | = default and std::make_unique | Henning Baldersheim | 2018-07-26 | 2 | -7/+5 |
| | | | | | |||||
| * | | | | Deinline | Henning Baldersheim | 2018-07-26 | 2 | -1/+4 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #6476 from vespa-engine/bjorncs/simple-detector-config | Bjørn Christian Seime | 2018-07-26 | 3 | -8/+46 |
|\ \ \ \ | | | | | | | | | | | Add config for simple-linguistics | ||||
| * | | | | Add missing newline at end of file | Bjørn Christian Seime | 2018-07-26 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | Add config for simple-linguistics | Bjørn Christian Seime | 2018-07-26 | 3 | -8/+45 |
| | | | | | | | | | | | | | | | | | | | | Add a config parameter for enabling/disabling optimaize detector | ||||
* | | | | | Merge pull request #6477 from vespa-engine/freva/fixes | Valerij Fredriksen | 2018-07-26 | 2 | -21/+0 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Remove convergeSuspend | ||||
| * | | | | Remove sout from test | Valerij Fredriksen | 2018-07-26 | 1 | -3/+0 |
| | | | | | |||||
| * | | | | Remove convergeSuspend | Valerij Fredriksen | 2018-07-26 | 1 | -18/+0 |
| |/ / / | |||||
* | | | | Merge pull request #6475 from vespa-engine/balder/random-cleanup | Henning Baldersheim | 2018-07-26 | 6 | -39/+23 |
|\ \ \ \ | | | | | | | | | | | nested namespaces | ||||
| * | | | | nested namespaces | Henning Baldersheim | 2018-07-26 | 6 | -39/+23 |
| | | | | | |||||
* | | | | | Merge pull request #6470 from vespa-engine/bjorncs/improve-controller-resilience | Morten Tokle | 2018-07-26 | 18 | -407/+199 |
|\ \ \ \ \ | | | | | | | | | | | | | Bjorncs/improve controller resilience | ||||
| * | | | | | Handle zms keys in addition to zts keys | Bjørn Christian Seime | 2018-07-25 | 5 | -24/+44 |
| | | | | | | |||||
| * | | | | | Move NTokenValidator to vespa-athenz + load pub keys from file | Bjørn Christian Seime | 2018-07-25 | 18 | -408/+180 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Move NTokenValidator from controller-server to vespa-athenz - Remodel ZmsKeystore as AthenzTruststore - Use file-backed truststore on controller (replaces download of public keys) - Remove ZmsClient.getPublicKey/getPublicKeys | ||||
* | | | | | | Merge pull request #6474 from vespa-engine/freva/periodic-maintainer-fix | Valerij Fredriksen | 2018-07-26 | 3 | -7/+8 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | [VESPA-12637] Check if deployment is still needed after acquiring the lock | ||||
| * | | | | | | Check if redeployment is still needed after acquiring the lock | Valerij Fredriksen | 2018-07-26 | 3 | -4/+6 |
| | | | | | | | |||||
| * | | | | | | Use immutable collections instead | Valerij Fredriksen | 2018-07-26 | 1 | -3/+2 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #6473 from vespa-engine/arnej/wait-for-destroyed-process | Henning Baldersheim | 2018-07-26 | 1 | -0/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | we want to wait until the "du" process is dead, to ensure not startin… | ||||
| * | | | | | we want to wait until the "du" process is dead, to ensure not starting too ↵ | Arne Juul | 2018-07-26 | 1 | -0/+1 |
|/ / / / / | | | | | | | | | | | | | | | | many of them |