summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #19725 from vespa-engine/vekterli/prioritize-forwarded-mer...v7.489.25Henning Baldersheim2021-10-253-19/+38
|\
| * Prioritize forwarded merges in MergeThrottler queueTor Brede Vekterli2021-10-253-19/+38
* | Merge pull request #19726 from vespa-engine/bratseth/search-builder-cleanupHenning Baldersheim2021-10-2589-508/+482
|\ \
| * | CleanupJon Bratseth2021-10-2542-140/+136
| * | SimplifyJon Bratseth2021-10-252-10/+1
| * | SimplifyJon Bratseth2021-10-252-11/+1
| * | Remove redundant schema listJon Bratseth2021-10-252-12/+11
| * | SearchBuilder -> SchemaBuilderJon Bratseth2021-10-2586-356/+354
* | | Merge pull request #19724 from vespa-engine/toregge/adjust-dummy-persistence-...Henning Baldersheim2021-10-254-11/+60
|\ \ \
| * | | Adjust dummy persistence spi semantics towards proton spi semantics whenTor Egge2021-10-254-11/+60
| | |/ | |/|
* | | Merge pull request #19727 from vespa-engine/revert-19715-upgrade-misc-contain...Arnstein Ressem2021-10-252-6/+6
|\ \ \
| * | | Revert "Upgrade lz4, slf4j and versions-maven-plugin [run-systemtest]"Arnstein Ressem2021-10-252-6/+6
|/ / /
* | | Merge pull request #19715 from vespa-engine/upgrade-misc-container-depsgjoranv2021-10-252-6/+6
|\ \ \
| * | | Upgrade lz4, slf4j and versions-maven-plugingjoranv2021-10-252-6/+6
* | | | Merge pull request #19704 from vespa-engine/jonmv/sliced-visitsJon Marius Venstad2021-10-258-31/+235
|\ \ \ \
| * | | | Address reviewJon Marius Venstad2021-10-253-45/+54
| * | | | Remove unintended checkJon Marius Venstad2021-10-221-4/+0
| * | | | Allow specifying slices and sliceId in /document/v1Jon Marius Venstad2021-10-223-1/+16
| * | | | Allow slicing the bucket space for visitorsJon Marius Venstad2021-10-225-13/+197
* | | | | Merge pull request #18118 from vespa-engine/dependabot/maven/parent/org.apach...Henning Baldersheim2021-10-251-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Bump httpclient from 4.5.12 to 4.5.13 in /parentdependabot[bot]2021-06-041-1/+1
* | | | | Merge pull request #19717 from vespa-engine/toregge/delay-apply-bucket-diff-s...Geir Storli2021-10-258-9/+49
|\ \ \ \ \
| * | | | | Delay deletion of ApplyBucketState.Tor Egge2021-10-258-9/+49
| | |_|_|/ | |/| | |
* | | | | Merge pull request #19720 from vespa-engine/hmusum/add-feature-flag-for-jdk-v...Harald Musum2021-10-252-1/+7
|\ \ \ \ \
| * | | | | Move to FlagsHarald Musum2021-10-252-6/+7
| * | | | | Add feature flag for JDK versionHarald Musum2021-10-251-0/+5
* | | | | | Merge pull request #19719 from vespa-engine/balder/async-create-bucket-2Henning Baldersheim2021-10-2521-266/+256
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Undo auto formatHenning Baldersheim2021-10-251-230/+217
| * | | | | GC unused codeHenning Baldersheim2021-10-251-15/+0
| * | | | | create/delete bucket will never throw.Henning Baldersheim2021-10-2514-282/+264
| * | | | | No need to wait for the result of async createBucket as the result is ignored...Henning Baldersheim2021-10-252-23/+28
| * | | | | Async createBucketHenning Baldersheim2021-10-2519-175/+206
|/ / / / /
* | | | | Merge pull request #19718 from vespa-engine/toregge/update-copyright-noticesgjoranv2021-10-255-5/+5
|\ \ \ \ \
| * | | | | Update copyright notices.Tor Egge2021-10-255-5/+5
|/ / / / /
* | | | | Merge pull request #19714 from vespa-engine/olaa/metering-metricsOla Aunrønning2021-10-252-6/+24
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add metering metricsOla Aunrønning2021-10-252-6/+24
* | | | | Merge pull request #19713 from vespa-engine/balder/execute-2-mutateHenning Baldersheim2021-10-254-47/+57
|\ \ \ \ \
| * | | | | onrerank -> on-first-phase and add on-second-phaseHenning Baldersheim2021-10-253-21/+31
| * | | | | Update execute -> mutate with '+=', '-=' and '='Henning Baldersheim2021-10-254-33/+33
| |/ / / /
* | | | | Merge pull request #19716 from vespa-engine/revert-19705-upgrade-asm-and-bund...Henning Baldersheim2021-10-251-2/+2
|\ \ \ \ \
| * | | | | Revert "Upgrade asm and bundle plugin"Arnstein Ressem2021-10-251-2/+2
|/ / / / /
* | | | | Merge pull request #19712 from vespa-engine/hakonhall/log-version-to-complete...Håkon Hallingstad2021-10-253-2/+12
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Log version to complete remote taskHåkon Hallingstad2021-10-253-2/+12
* | | | | Merge pull request #19705 from vespa-engine/upgrade-asm-and-bundle-pluginHenning Baldersheim2021-10-251-2/+2
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into upgrade-asm-and-bundle-pluginHenning Baldersheim2021-10-2546-159/+485
| |\ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | |
* | | | | Merge pull request #19711 from vespa-engine/balder/add-util-metricsv7.488.67Henning Baldersheim2021-10-242-1/+5
|\ \ \ \ \
| * | | | | Add metrics for thread utilizationHenning Baldersheim2021-10-242-1/+5
|/ / / / /
* | | | | Merge pull request #19710 from vespa-engine/jonmv/fixitHarald Musum2021-10-243-5/+2
|\ \ \ \ \
| * | | | | Revrte felix 7.0.1Jon Marius Venstad2021-10-243-5/+2
|/ / / / /
* | | | | Merge pull request #19706 from vespa-engine/balder/avoid-space-for-arith-oper...Henning Baldersheim2021-10-239-27/+26
|\ \ \ \ \