aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #19668 from vespa-engine/revert-19646-aressem/test-skip-st...v7.487.27Arnstein Ressem2021-10-201-2/+2
|\
| * Revert "Test skipping the local staging storage as we do explicit close of th...Arnstein Ressem2021-10-201-2/+2
|/
* Merge pull request #19667 from vespa-engine/bratseth/remove-copyrightHenning Baldersheim2021-10-201-1/+0
|\
| * Remove unnecessary headerJon Bratseth2021-10-201-1/+0
|/
* Merge pull request #19658 from vespa-engine/bratseth/no-field-in-weakandJon Bratseth2021-10-204-15/+19
|\
| * Remove unnecessary fieldJon Bratseth2021-10-203-9/+11
| * WeakAnd has no fieldJon Bratseth2021-10-203-7/+9
* | Merge pull request #19659 from vespa-engine/bratseth/add-missing-copyrightsJon Bratseth2021-10-2099-35/+123
|\ \
| * \ Merge branch 'master' into bratseth/add-missing-copyrightsJon Bratseth2021-10-20320-2705/+3862
| |\ \ | |/ / |/| |
* | | Merge pull request #19665 from vespa-engine/toregge/fix-eliminate-apply-bucke...Henning Baldersheim2021-10-201-1/+1
|\ \ \
| * | | Remove bad std::move.Tor Egge2021-10-201-1/+1
|/ / /
* | | Merge pull request #19660 from vespa-engine/remove-duplicate-classgjoranv2021-10-203-65/+5
|\ \ \
| * | | Remove duplicate test util class and dependency to hamcrest-json.gjoranv2021-10-203-65/+5
| | |/ | |/|
* | | Merge pull request #19662 from vespa-engine/balder/ignore-test-and-set-errorsBjørn Christian Seime2021-10-201-1/+6
|\ \ \
| * | | Ignore test and set errorsHenning Baldersheim2021-10-201-1/+6
| |/ /
* | | Merge pull request #19653 from vespa-engine/bratseth/schema-inheritanceHenning Baldersheim2021-10-20263-2426/+3535
|\ \ \
| * | | Test deriving with inherited schemaJon Bratseth2021-10-205-13/+74
| * | | Clean up after testJon Bratseth2021-10-201-6/+13
| * | | Prep for test of deriving with schema inheritanceJon Bratseth2021-10-2018-6/+512
| * | | Test adding to inherited collectionsJon Bratseth2021-10-196-40/+138
| * | | Test 2 levelsJon Bratseth2021-10-191-19/+32
| * | | Inherit raw-as-base64Jon Bratseth2021-10-192-2/+8
| * | | Inherit imported fieldsJon Bratseth2021-10-196-7/+34
| * | | Use 'schema' not 'search' in messagesJon Bratseth2021-10-1939-148/+150
| * | | Inherit document summariesJon Bratseth2021-10-194-21/+47
| * | | Inherit ONNX modelsJon Bratseth2021-10-1912-42/+101
| * | | ImmutableSearch -> ImmutableSchemaJon Bratseth2021-10-185-11/+11
| * | | Inherit constantsJon Bratseth2021-10-187-27/+54
| * | | Inherit rank profilesJon Bratseth2021-10-188-30/+58
| * | | Inherit fieldsJon Bratseth2021-10-184-12/+27
| * | | Inherit indexesJon Bratseth2021-10-162-34/+47
| * | | Inherit stemmingJon Bratseth2021-10-163-45/+60
| * | | Inherit fieldSetsJon Bratseth2021-10-162-4/+27
| * | | Validate schema inheritanceJon Bratseth2021-10-1656-149/+236
| * | | search -> schemaJon Bratseth2021-10-15210-1917/+1898
| * | | Add Application abstractionJon Bratseth2021-10-1513-58/+173
* | | | Merge pull request #19661 from shahariel/masterJon Bratseth2021-10-2051-205/+315
|\ \ \ \
| * \ \ \ Merge branch 'vespa-engine:master' into masterShahar Ariel2021-10-2067-541/+753
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Add class headers with description and @author tagsariel2021-10-2050-116/+209
| * | | | Update plugin's namesariel2021-10-201-5/+5
| * | | | Complete grammar, add annotationsariel2021-10-206-86/+102
| * | | | Add running instructionssariel2021-10-201-1/+2
* | | | | Merge pull request #19657 from vespa-engine/upgrade-plexus-utils-in-documentg...gjoranv2021-10-201-5/+0
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Remove explicit versions to inherit more up-to-date-versions.gjoranv2021-10-201-5/+0
| | | | * Remove unnecessary headingsJon Bratseth2021-10-205-6/+1
| | | | * Correct copyright headersJon Bratseth2021-10-2016-16/+8
| | | | * Add missiung copyrightsJon Bratseth2021-10-20104-21/+124
| |_|_|/ |/| | |
* | | | Merge pull request #19655 from vespa-engine/toregge/eliminate-apply-bucket-di...Geir Storli2021-10-2010-173/+128
|\ \ \ \
| * | | | Eliminate ApplyBucketDiffEntryResult.Tor Egge2021-10-2010-173/+128
* | | | | Merge pull request #19650 from vespa-engine/toregge/add-async-apply-bucket-di...Geir Storli2021-10-204-2/+15
|\ \ \ \ \ | |_|/ / / |/| | | |