summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Automatic commit of package [vespa] release [6.268.1-1].vespa-6.268.1-1by-screwdriver2018-08-014-1/+2
* Merge pull request #6467 from vespa-engine/henrhoi/es_vespa_parserHenrik Høiness2018-07-301-0/+222
|\
| * Added arg --application_name, now creating folder for searchdefs ++Henrik2018-07-261-63/+55
| * Added description, example of usage and authorHenrik2018-07-251-1/+5
| * Created parser that takes in ES-documents and ES-mapping and parses them into...Henrik2018-07-251-0/+226
* | Merge pull request #6486 from vespa-engine/arnej/splunk-start-optionsTor Brede Vekterli2018-07-271-11/+18
|\ \
| * | forgot terminating nullptrArne Juul2018-07-271-0/+1
| * | refactor to accept any number of argsArne Juul2018-07-271-11/+17
| * | add more "just do it" option to splunk startArne Juul2018-07-271-1/+1
* | | Merge pull request #6487 from vespa-engine/toregge/add-proton-disk-layout-ske...Henning Baldersheim2018-07-279-19/+176
|\ \ \ | |/ / |/| |
| * | Rename method according to review feedback.Tor Egge2018-07-275-9/+7
| * | Add skeleton for proton disk layout, to better handle removal ofTor Egge2018-07-279-19/+178
|/ /
* | Merge pull request #6483 from vespa-engine/balder/add-getSortedHeapHitsHenning Baldersheim2018-07-263-91/+108
|\ \
| * | Simplify since reRank i snot incremental.Henning Baldersheim2018-07-261-8/+4
| * | Split reRank in 2 where one is using the other for later reuse.Henning Baldersheim2018-07-262-2/+14
| * | Add test for getSortedHeapHitsHenning Baldersheim2018-07-261-2/+13
| * | Fix up clang-tidy warningsHenning Baldersheim2018-07-261-64/+56
| * | Add getSortedHeapHitsHenning Baldersheim2018-07-262-21/+27
|/ /
* | Merge pull request #6480 from vespa-engine/arnej/abi-compatMorten Tokle2018-07-261-3/+7
|\ \
| * | preserve binary compatibilityArne Juul2018-07-261-3/+7
* | | Merge pull request #6479 from vespa-engine/balder/refactor-diversity-for-reuseHenning Baldersheim2018-07-265-143/+185
|\ \ \
| * | | Restructure for code reuse and hiding implementation.Henning Baldersheim2018-07-265-164/+150
| * | | Restructure for code reuse and hiding implementation.Henning Baldersheim2018-07-261-0/+16
| * | | Make diversifier virtual for easier reuse and minimal runtime impact.Henning Baldersheim2018-07-262-42/+50
| * | | No need for templated argument anymoreHenning Baldersheim2018-07-261-23/+34
| * | | Split in filter and recorder for reuse.Henning Baldersheim2018-07-261-18/+39
| |/ /
* | | Merge pull request #6368 from vespa-engine/bjorncs/move-athenz-principal-filterBjørn Christian Seime2018-07-265-86/+85
|\ \ \
| * | | Move AthenzPrincipalFilter to jdisc-security-filtersBjørn Christian Seime2018-07-265-86/+85
* | | | Merge pull request #6469 from vespa-engine/vekterli/remove-dangerous-stringre...Tor Brede Vekterli2018-07-26129-365/+386
|\ \ \ \ | |_|/ / |/| | |
| * | | Don't string wrap refs that are guaranteed to be zero-terminatedTor Brede Vekterli2018-07-269-11/+12
| * | | Remove stringref::c_str()Tor Brede Vekterli2018-07-25128-365/+385
* | | | Merge pull request #6478 from vespa-engine/balder/random-deinline-and-some-moreHenning Baldersheim2018-07-265-9/+10
|\ \ \ \
| * | | | Add finalHenning Baldersheim2018-07-261-1/+1
| * | | | = default and std::make_uniqueHenning Baldersheim2018-07-262-7/+5
| * | | | DeinlineHenning Baldersheim2018-07-262-1/+4
| | |/ / | |/| |
* | | | Merge pull request #6476 from vespa-engine/bjorncs/simple-detector-configBjørn Christian Seime2018-07-263-8/+46
|\ \ \ \
| * | | | Add missing newline at end of fileBjørn Christian Seime2018-07-261-1/+2
| * | | | Add config for simple-linguisticsBjørn Christian Seime2018-07-263-8/+45
* | | | | Merge pull request #6477 from vespa-engine/freva/fixesValerij Fredriksen2018-07-262-21/+0
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Remove sout from testValerij Fredriksen2018-07-261-3/+0
| * | | | Remove convergeSuspendValerij Fredriksen2018-07-261-18/+0
| |/ / /
* | | | Merge pull request #6475 from vespa-engine/balder/random-cleanupHenning Baldersheim2018-07-266-39/+23
|\ \ \ \
| * | | | nested namespacesHenning Baldersheim2018-07-266-39/+23
* | | | | Merge pull request #6470 from vespa-engine/bjorncs/improve-controller-resilienceMorten Tokle2018-07-2618-407/+199
|\ \ \ \ \
| * | | | | Handle zms keys in addition to zts keysBjørn Christian Seime2018-07-255-24/+44
| * | | | | Move NTokenValidator to vespa-athenz + load pub keys from fileBjørn Christian Seime2018-07-2518-408/+180
* | | | | | Merge pull request #6474 from vespa-engine/freva/periodic-maintainer-fixValerij Fredriksen2018-07-263-7/+8
|\ \ \ \ \ \
| * | | | | | Check if redeployment is still needed after acquiring the lockValerij Fredriksen2018-07-263-4/+6
| * | | | | | Use immutable collections insteadValerij Fredriksen2018-07-261-3/+2
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #6473 from vespa-engine/arnej/wait-for-destroyed-processHenning Baldersheim2018-07-261-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |