summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Update 2017 copyright notices.gjoranv2021-10-0713478-13523/+13523
* Merge pull request #19442 from vespa-engine/hmusum/remove-use-of-old-method-f...gjoranv2021-10-078-32/+10
|\
| * setError() -> switchConnection() and remove setError()Harald Musum2021-10-068-32/+10
* | Merge pull request #19440 from vespa-engine/hmusum/config-subscription-refact...gjoranv2021-10-073-49/+45
|\ \
| * | Refactor so that logic is in nextConfig()Harald Musum2021-10-063-49/+45
| |/
* | Merge pull request #19444 from vespa-engine/bratseth/initalize-fallback-singl...Jon Bratseth2021-10-076-44/+54
|\ \
| * | Create config server when not configured explicitlyJon Bratseth2021-10-066-44/+54
* | | Merge pull request #19445 from vespa-engine/hmusum/reduce-config-proxy-max-heapHenning Baldersheim2021-10-071-1/+1
|\ \ \
| * | | Reduce config proxy max heap from 256 Mb to 128 MbHarald Musum2021-10-071-1/+1
|/ / /
* | | Merge pull request #19438 from vespa-engine/bratseth/initalize-fallback-singl...Jon Marius Venstad2021-10-0611-79/+88
|\| |
| * | Merge branch 'master' into bratseth/initalize-fallback-singlenodeJon Bratseth2021-10-065-207/+102
| |\ \
| | * | Assign host and call initServices on distributorJon Bratseth2021-10-062-21/+21
| * | | Call initService when falling back to a single nodeJon Bratseth2021-10-0610-59/+67
* | | | Merge pull request #19443 from vespa-engine/hmusum/add-transaction-info-to-ex...Jon Bratseth2021-10-061-2/+2
|\ \ \ \
| * | | | Add transaction info to exceptionHarald Musum2021-10-061-2/+2
| | |_|/ | |/| |
* | | | Merge pull request #19437 from vespa-engine/geirst/remove-num-distributor-str...Henning Baldersheim2021-10-064-18/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Remove num-distributor-stripes feature flag.Geir Storli2021-10-064-18/+0
| |/ /
* | | Merge pull request #19436 from vespa-engine/toregge/enable-refeed-during-redi...Geir Storli2021-10-064-23/+160
|\ \ \ | |_|/ |/| |
| * | Enable refeed during document redistribution.Tor Egge2021-10-064-23/+160
* | | Merge pull request #19435 from vespa-engine/vekterli/minor-merge-throttler-co...Tor Brede Vekterli2021-10-063-185/+79
|\ \ \ | |_|/ |/| |
| * | Minor MergeThrottler code cleanups. No functional changes.Tor Brede Vekterli2021-10-063-185/+79
* | | Merge pull request #19434 from vespa-engine/vekterli/add-feature-flag-for-ign...Tor Brede Vekterli2021-10-066-4/+42
|\ \ \
| * | | Add feature flag for ignoring merge queue limit for forwarded (chained) mergesTor Brede Vekterli2021-10-066-4/+42
|/ / /
* | | Merge pull request #19433 from vespa-engine/baledr/avoid-anonymous-constructorsBjørn Christian Seime2021-10-062-60/+37
|\ \ \ | |_|/ |/| |
| * | - GC unused AsyncCompleteListener.javaHenning Baldersheim2021-10-062-60/+37
|/ /
* | Merge pull request #19431 from vespa-engine/havardpe/add-errors-to-replyHåvard Pettersen2021-10-061-0/+6
|\ \
| * | add errors to reply messagesHåvard Pettersen2021-10-061-0/+6
* | | Merge pull request #19430 from vespa-engine/lesters/add-tensor-expandLester Solbakken2021-10-067-6/+126
|\ \ \ | |/ / |/| |
| * | Organize importsLester Solbakken2021-10-061-5/+19
| * | Add expand function to tensor classLester Solbakken2021-10-062-18/+7
| * | Remove temporary test caseLester Solbakken2021-10-061-8/+0
| * | Add non-primitive tensor expand functionLester Solbakken2021-10-066-3/+128
|/ /
* | Merge pull request #19427 from vespa-engine/hmusum/depend-on-http-client-with...Harald Musum2021-10-062-18/+32
|\ \
| * | Let VespaHttpClientBuilder rewrite to https if necessaryHarald Musum2021-10-061-1/+1
| * | Rewrite to use new apache http clientHarald Musum2021-10-062-18/+32
| * | Depend on http client with compile scope, used in standalone scriptHarald Musum2021-10-061-1/+1
* | | Merge pull request #19428 from vespa-engine/balder/attach-contextv7.479.3Henning Baldersheim2021-10-0610-11/+37
|\ \ \ | |/ / |/| |
| * | Attach contextHenning Baldersheim2021-10-062-1/+7
| * | Attach contextHenning Baldersheim2021-10-068-10/+30
|/ /
* | Merge pull request #19425 from vespa-engine/bratseth/contributing-fixesv7.478.19Frode Lundgren2021-10-053-24/+100
|\ \
| * | Clean up contribution infoJon Bratseth2021-10-053-24/+100
* | | Merge pull request #19420 from vespa-engine/arnej/wrap-all-maps-in-json-rendererJon Bratseth2021-10-053-7/+107
|\ \ \
| * | | rename option -> renderer.json.jsonMapsArne H Juul2021-10-052-14/+14
| * | | remove debug printsArne H Juul2021-10-051-7/+0
| * | | extend unit testArne H Juul2021-10-011-2/+5
| * | | change query option to "renderer.json.recognizeDeepMaps"Arne H Juul2021-10-012-14/+14
| * | | simplify moreArne H Juul2021-10-011-17/+17
| * | | add option to recognize maps deep inside hit fieldsArne H Juul2021-10-013-7/+111
* | | | Merge pull request #19422 from vespa-engine/hmusum/config-subscription-refact...Henning Baldersheim2021-10-055-255/+111
|\ \ \ \
| * | | | Simplify backoff when getting config failsHarald Musum2021-10-054-193/+56