summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | 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 vespa-engine/toregge/remove-unused-field-match...Tor Egge2020-05-224-109/+1
|\ \ \ \ \ \
| * | | | | | 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.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 unuesHarald Musum2020-05-211-1/+1
|/ / / /
* | | | Merge pull request #13337 from vespa-engine/revert-13332-hmusum/use-remote-se...Jon Marius Venstad2020-05-2010-63/+47
|\ \ \ \
| * | | | Revert "Hmusum/use remote session repo for finding active session"Harald Musum2020-05-2010-63/+47
|/ / / /
* | | | Merge pull request #13332 from vespa-engine/hmusum/use-remote-session-repo-fo...Harald Musum2020-05-2010-47/+63
|\ \ \ \
| * | | | Use remote session repo to find active sessionHarald Musum2020-05-2010-47/+63
* | | | | Merge pull request #13331 from vespa-engine/geirst/prepare-for-matched-elemen...Tor Egge2020-05-2047-344/+353
|\ \ \ \ \
| * | | | | Prepare to support matched-elements-only for arrays and weighted sets of prim...Geir Storli2020-05-2047-344/+353
* | | | | | Merge pull request #13328 from vespa-engine/toregge/split-out-constant-portio...Tor Egge2020-05-209-152/+235
|\ \ \ \ \ \
| * | | | | | 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 vespa-engine/revert-13334-revert-13309-revert-...Harald Musum2020-05-2013-83/+237
|\ \ \ \ \ \
| * | | | | | Fix version in spec fileHarald Musum2020-05-201-2/+2
| * | | | | | Revert "Revert "Reapply "Build vespa zookeeper server variants with zookeeper...Harald Musum2020-05-2012-81/+235
* | | | | | | Merge pull request #13326 from vespa-engine/hmusum/move-and-remove-testsHarald Musum2020-05-203-61/+55
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Move one test to another class and remove 2 tests that are tested elsewhereHarald Musum2020-05-203-61/+55
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #13333 from vespa-engine/bjorncs/health-check-proxy-timeou...Bjørn Christian Seime2020-05-203-0/+16
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Merge remote-tracking branch 'origin/master' into bjorncs/health-check-proxy-...Bjørn Christian Seime2020-05-2013-235/+87
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #13334 from vespa-engine/revert-13309-revert-13308-revert-...Harald Musum2020-05-2012-235/+81
|\ \ \ \ \ \
| * | | | | | Revert "Reapply "Build vespa zookeeper server variants with zookeeper 3.5.6 a...Harald Musum2020-05-2012-235/+81
|/ / / / / /
* | | | | | Merge pull request #13329 from vespa-engine/mortent/application-iam-roleMorten Tokle2020-05-201-0/+6
|\ \ \ \ \ \
| * | | | | | Feature flag for rolling out application iam rolesMorten Tokle2020-05-201-0/+6
| | * | | | | Create feature flag for timeout of jdisc health check proxy clientBjørn Christian Seime2020-05-203-0/+16
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #13330 from vespa-engine/bjorncs/improve-health-check-prox...Bjørn Christian Seime2020-05-203-22/+29
|\ \ \ \ \ \
| * | | | | | Make proxy client timeout configurableBjørn Christian Seime2020-05-203-22/+29
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #13324 from vespa-engine/bratseth/remove-groups-immediatelyJon Bratseth2020-05-2010-93/+117
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | By offering reserved before inactive, prepare becomes always idempotentJon Bratseth2020-05-202-11/+6
| * | | | | Remove groups immediatelyJon Bratseth2020-05-209-82/+111
* | | | | | Merge pull request #13327 from vespa-engine/bjorncs/apache-httpclientHenning Baldersheim2020-05-201-1/+1
|\ \ \ \ \ \
| * | | | | | Upgrade httpclient to 4.5.12Bjørn Christian Seime2020-05-201-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #13325 from vespa-engine/revert-13311-gjoranv/create-regis...Jon Bratseth2020-05-2013-101/+15
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Revert "Gjoranv/create registry from config"Harald Musum2020-05-2013-101/+15
|/ / / / /
* | | | | Merge pull request #13321 from vespa-engine/toregge/fieldmatch-style-fixesHenning Baldersheim2020-05-2010-63/+15
|\ \ \ \ \
| * | | | | Remove unused methods.Tor Egge2020-05-202-10/+0
| * | | | | Use nested namespace definitions.Tor Egge2020-05-208-53/+15
* | | | | | Merge pull request #13311 from vespa-engine/gjoranv/create-registry-from-configgjoranv2020-05-2013-15/+101
|\ \ \ \ \ \
| * | | | | | Add the query profile registry to the set of test componentsgjoranv2020-05-206-3/+9
| * | | | | | Make the main constructor take a CompiledQueryProfileRegistrygjoranv2020-05-202-1/+24
| * | | | | | Follow naming convention by using singular 'profileRegistry'gjoranv2020-05-192-6/+5
| * | | | | | Add CompiledQueryProfileRegistry component for injection.gjoranv2020-05-192-0/+17
| * | | | | | Allow creating a CompiledQueryProfileRegistry from config.gjoranv2020-05-194-11/+52
* | | | | | | Merge pull request #13323 from vespa-engine/balder/specify-dispatch-policy-ex...Henning Baldersheim2020-05-201-0/+1
|\ \ \ \ \ \ \