summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #13351 from ↵gjoranv2020-05-2315-17/+111
|\ | | | | | | | | vespa-engine/gjoranv/injectable-query-profile-registry Gjoranv/injectable query profile registry
| * Add helper method to create a component from class and bundle.gjoranv2020-05-222-5/+6
| |
| * Instantiate registry from search-and-docproc bundlegjoranv2020-05-221-2/+10
| |
| * Improve class commentgjoranv2020-05-221-2/+1
| |
| * Add the query profile registry to the set of test componentsgjoranv2020-05-226-3/+9
| | | | | | | | | | | | | | | | .. for all integration style tests. Note that these tests were written before the DI framework, and typically used the former 'handlers' config as only handlers and searchers could be configured at the time.
| * Make the main constructor take a CompiledQueryProfileRegistrygjoranv2020-05-222-1/+24
| | | | | | | | .. instead of QueryProfilesConfig
| * Follow naming convention by using singular 'profileRegistry'gjoranv2020-05-222-6/+5
| |
| * Add CompiledQueryProfileRegistry component for injection.gjoranv2020-05-222-0/+17
| |
| * Allow creating a CompiledQueryProfileRegistry from config.gjoranv2020-05-224-11/+52
| |
* | Merge pull request #13348 from vespa-engine/bratseth/real-resources-in-modelJon Bratseth2020-05-2240-217/+395
|\ \ | | | | | | Bratseth/real resources in model
| * | Update ↵Jon Bratseth2020-05-221-6/+0
| | | | | | | | | | | | | | | config-model/src/main/java/com/yahoo/config/model/provision/SingleNodeProvisioner.java Co-authored-by: Valerij Fredriksen <freva@users.noreply.github.com>
| * | Expect consistencyJon Bratseth2020-05-221-3/+3
| | |
| * | Access resources directlyJon Bratseth2020-05-2215-78/+88
| | |
| * | Clean up HostSpec constructorsJon Bratseth2020-05-2211-101/+127
| | |
| * | Clean up HostSpec constructorsJon Bratseth2020-05-2222-95/+232
| | |
| * | Access flavor resources through resources()Jon Bratseth2020-05-216-7/+9
| | |
| * | Access flavor resources through resources()Jon Bratseth2020-05-214-16/+25
| | |
* | | Merge pull request #13350 from vespa-engine/bjorncs/upgrade-jettyHarald Musum2020-05-221-1/+1
|\ \ \ | | | | | | | | Upgrade Jetty to 9.4.28
| * | | Upgrade Jetty to 9.4.28Bjørn Christian Seime2020-05-221-1/+1
| | | |
* | | | Merge pull request #13349 from ↵Tor Brede Vekterli2020-05-221-1/+3
|\ \ \ \ | |/ / / |/| | | | | | | | | | | vespa-engine/vekterli/persistence-message-exception-safety Don't tie message lifetime directly to tracker object
| * | | Don't tie message lifetime directly to tracker objectTor Brede Vekterli2020-05-221-1/+3
| | |/ | |/| | | | | | | | | | | | | | | | The tracker was passed by move down to the handler function, but the surrounding code would try to auto-synthesize a reply from the message (now owned by the tracker) if an exception was thrown from the handler. Fun ensued.
* | | Merge pull request #13346 from vespa-engine/revert-13342-bjorncs/upgrade-jettyBjørn Christian Seime2020-05-221-1/+1
|\ \ \ | |/ / |/| | Revert "Upgrade Jetty to 9.4.29"
| * | Revert "Upgrade Jetty to 9.4.29"Bjørn Christian Seime2020-05-221-1/+1
|/ /
* | Merge pull request #13345 from vespa-engine/aressem/add-javadoc-jarHarald Musum2020-05-221-0/+6
|\ \ | | | | | | Add javadoc jars.
| * | Add javadoc jars.Arnstein Ressem2020-05-221-0/+6
|/ /
* | Merge pull request #13338 from ↵Harald Musum2020-05-2211-81/+100
|\ \ | | | | | | | | | | | | vespa-engine/revert-13337-revert-13332-hmusum/use-remote-session-repo-for-finding-active-session Reapply "Use remote session repo for finding active session"
| * | Make sure to use active local session in deployFromLocalActiveHarald Musum2020-05-207-51/+54
| | | | | | | | | | | | Move methods up to Session and generalize createSessionFromExisting()
| * | Revert "Revert "Hmusum/use remote session repo for finding active session""Harald Musum2020-05-2010-47/+63
| | |
* | | Merge pull request #13341 from takamabe/fixed-prometheus-metricsgjoranv2020-05-221-1/+1
|\ \ \ | | | | | | | | The prometheus metrics returns duplicate HELP and TYPE lines.
| * | | merged same samples to a single sample, with a unique name and set of labels.takamabe2020-05-201-1/+1
| | | |
* | | | Merge pull request #13340 from ↵Tor Egge2020-05-224-109/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | vespa-engine/toregge/remove-unused-field-match-computer-tracing Remove unused field match computer tracing.
| * | | | Remove unused field match computer tracing.Tor Egge2020-05-214-109/+1
| | |_|/ | |/| |
* | | | Merge pull request #13342 from vespa-engine/bjorncs/upgrade-jettyBjørn Christian Seime2020-05-221-1/+1
|\ \ \ \ | |/ / / |/| | | Upgrade Jetty to 9.4.29
| * | | Upgrade Jetty to 9.4.29Bjørn Christian Seime2020-05-221-1/+1
|/ / /
* | | Merge pull request #13339 from vespa-engine/hmusum/rename-flag-idHarald Musum2020-05-211-1/+1
|\ \ \ | |_|/ |/| | Rename flag id to avoid collision with one that still has is unues
| * | Rename flag id to avoid collision with one that still has is unuesHarald Musum2020-05-211-1/+1
|/ / | | | | | | in code, but still has values set in flag database
* | Merge pull request #13337 from ↵Jon Marius Venstad2020-05-2010-63/+47
|\ \ | | | | | | | | | | | | vespa-engine/revert-13332-hmusum/use-remote-session-repo-for-finding-active-session Revert "Hmusum/use remote session repo for finding active session"
| * | Revert "Hmusum/use remote session repo for finding active session"Harald Musum2020-05-2010-63/+47
|/ /
* | Merge pull request #13332 from ↵Harald Musum2020-05-2010-47/+63
|\ \ | | | | | | | | | | | | vespa-engine/hmusum/use-remote-session-repo-for-finding-active-session Hmusum/use remote session repo for finding active session
| * | Use remote session repo to find active sessionHarald Musum2020-05-2010-47/+63
| | | | | | | | | | | | | | | Active session is not necessarily a local session, it might have been created on another config server.
* | | Merge pull request #13331 from ↵Tor Egge2020-05-2047-344/+353
|\ \ \ | | | | | | | | | | | | | | | | vespa-engine/geirst/prepare-for-matched-elements-only-on-primitive-types Prepare to support matched-elements-only for arrays and weighted sets…
| * | | Prepare to support matched-elements-only for arrays and weighted sets of ↵Geir Storli2020-05-2047-344/+353
| | | | | | | | | | | | | | | | | | | | | | | | | | | | primitive types. This renames StructFieldMapper to MatchingElementsFields with added support for basic fields. Also some terminology is aligned.
* | | | Merge pull request #13328 from ↵Tor Egge2020-05-209-152/+235
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | vespa-engine/toregge/split-out-constant-portion-of-phrase-splitter-to-phrase-splitter-query-env Split out constant portion of phrase splitter to phrase splitter query env
| * | | | Reduce verbosity of method name for getting phrase splitter query env.Tor Egge2020-05-203-19/+19
| | | | |
| * | | | Adjust constructor comment.Tor Egge2020-05-201-1/+1
| | | | |
| * | | | Update class comments for PhraseSplitter and PhraseSplitterQueryEnv.Tor Egge2020-05-202-18/+13
| | | | |
| * | | | Explicitly manage PhraseSplitterQueryEnv.Tor Egge2020-05-208-52/+78
| | | | |
| * | | | Split out constant portion of PhraseSplitter to PhraseSplitterQueryEnv.Tor Egge2020-05-205-107/+169
| | | | |
* | | | | Merge pull request #13335 from ↵Harald Musum2020-05-2013-83/+237
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/revert-13334-revert-13309-revert-13308-revert-13301-hmusum/build-zookeeper-3.5.8 Reapply "Build vespa zookeeper server variants with zookeeper 3.5.6 and 3.5.8"
| * | | | | Fix version in spec fileHarald Musum2020-05-201-2/+2
| | | | | |