aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Automatic commit of package [vespa] release [7.22.18-1].vespa-7.22.18-1by-screwdriver2019-03-064-1/+2
| | | | | | Created by command: /usr/bin/tito tag --use-version=7.22.18 --no-auto-changelog
* Merge pull request #8685 from ↵Bjørn Meland2019-03-051-1/+1
|\ | | | | | | | | vespa-engine/revert-8680-jvenstad/decouple-test-framework-version-for-v4s Revert "Decouple test framework version now we're on 7"
| * Revert "Decouple test framework version now we're on 7"Harald Musum2019-03-051-1/+1
|/
* Merge pull request #8680 from ↵Jon Marius Venstad2019-03-051-1/+1
|\ | | | | | | | | vespa-engine/jvenstad/decouple-test-framework-version-for-v4s Decouple test framework version now we're on 7
| * Decouple test framework version now we're on 7Jon Marius Venstad2019-03-051-1/+1
|/
* Merge pull request #8678 from ↵Harald Musum2019-03-057-21/+44
|\ | | | | | | | | vespa-engine/hmusum/change-deactivate-to-return-not-found-exception Deactivate should return NotFoundException
| * Deactivate should return NotFoundExceptionHarald Musum2019-03-057-21/+44
| | | | | | | | Handle that internally in controller and add a test for it
* | Merge pull request #8670 from vespa-engine/gjoranv/use-container-service-type_2gjoranv2019-03-0519-28/+82
|\ \ | | | | | | Gjoranv/use container service type 2
| * | Import new package in config-model-api,gjoranv2019-03-041-0/+1
| | |
| * | Use ContainerServiceType in configserver.gjoranv2019-03-0411-19/+36
| | |
| * | Add unit test to ensure names don't change.gjoranv2019-03-041-0/+31
| | |
| * | Rename name field to avoid confusion with Enum's 'name()'gjoranv2019-03-042-4/+4
| | |
| * | Move ContainerServiceType to config-model-apigjoranv2019-03-046-5/+10
| | | | | | | | | | | | .. to make it accessible without depending on config-model.
* | | Merge pull request #8652 from vespa-engine/mpolden/limit-lb-service-fieldsMartin Polden2019-03-0513-151/+182
|\ \ \ | |_|/ |/| | Limit fields that can be mutated by a LoadBalancerService
| * | Simplify mockMartin Polden2019-03-012-9/+8
| | |
| * | Test load balancer re-activationMartin Polden2019-03-012-0/+13
| | |
| * | SimplifyMartin Polden2019-03-011-11/+9
| | |
| * | Limit fields that can be mutated by a LoadBalancerServiceMartin Polden2019-03-0111-120/+153
| | |
| * | Remove unnecessary default implementationsMartin Polden2019-03-012-14/+2
| | |
* | | Merge pull request #8662 from ↵Harald Musum2019-03-051-4/+0
|\ \ \ | | | | | | | | | | | | | | | | vespa-engine/hmusum/stop-using-name-parameter-when-creating-session Stop using 'name' request parameter, undocumented and not needed
| * | | Stop using 'name' request parameter, undocumented and not neededHarald Musum2019-03-041-4/+0
| | | |
* | | | Merge pull request #8676 from ↵Håkon Hallingstad2019-03-045-17/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | vespa-engine/hakonhall/use-list-instead-of-set-for-flags-rulesconditionsvalues Use List instead of Set for flags rules.conditions.values
| * | | | Use List instead of Set for flags rules.conditions.valuesHåkon Hallingstad2019-03-045-17/+14
| | | | |
* | | | | Merge pull request #8674 from vespa-engine/gjoranv/setMillis-is-deprecatedBjørn Christian Seime2019-03-047-38/+30
|\ \ \ \ \ | | | | | | | | | | | | JDK 11: Replace LogRecord.setMillis with setInstant.
| * | | | | JDK 11: Replace LogRecord.setMillis with setInstant.gjoranv2019-03-047-38/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Suppress deprecation warnings locally instead of globally in controller-server.
* | | | | | Merge pull request #8675 from ↵gjoranv2019-03-041-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/revert-8672-gjoranv/upgrade-dependency-plugin Revert "Use latest maven-dependency-plugin."
| * | | | | | Revert "Use latest maven-dependency-plugin."gjoranv2019-03-041-1/+1
|/ / / / / /
* | | | | | Merge pull request #8667 from vespa-engine/hmusum/cleanup-config-server-testsHarald Musum2019-03-042-96/+24
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Move the one useful test, remove the rest
| * | | | | Fix assertHarald Musum2019-03-041-1/+1
| | | | | |
| * | | | | Move the one useful test, remove the restHarald Musum2019-03-043-97/+24
| | | | | |
* | | | | | Merge pull request #8672 from vespa-engine/gjoranv/upgrade-dependency-pluginBjørn Christian Seime2019-03-041-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use latest maven-dependency-plugin.
| * | | | | | Use latest maven-dependency-plugin.gjoranv2019-03-041-1/+1
| | | | | | |
* | | | | | | Merge pull request #8669 from vespa-engine/bjorncs/tls-insecure-mixed-modeBjørn Christian Seime2019-03-041-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | Bjorncs/tls insecure mixed mode
| * | | | | | Change default to 'tls_client_mixed_server'Bjørn Christian Seime2019-03-041-1/+1
| | | | | | |
| * | | | | | Stop reload task when there are no external references to the managersBjørn Christian Seime2019-03-042-18/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reload task will shut down the executor service when the GC has determined that there are no other references to the key/trust manager.
* | | | | | | Merge pull request #8668 from ↵Jon Bratseth2019-03-0418-81/+28
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/revert-8657-gjoranv/use-container-service-type Revert "Gjoranv/use container service type"
| * | | | | | | Revert "Gjoranv/use container service type"gjoranv2019-03-0418-81/+28
|/ / / / / / /
* | | | | | | Merge pull request #8656 from vespa-engine/bjorncs/reloading-tls-contextBjørn Christian Seime2019-03-042-18/+126
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Stop reload task when there are no external references to the managers
| * | | | | | | Stop reload task when there are no external references to the managersBjørn Christian Seime2019-03-012-18/+126
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | The reload task will shut down the executor service when the GC has determined that there are no other references to the key/trust manager.
* | | | | | | Merge pull request #8664 from ↵Henning Baldersheim2019-03-042-4/+21
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | vespa-engine/toregge/skip-imported-attribute-if-target-attribute-is-missing Don't create imported attribute if target attribute is missing.
| * | | | | | Don't create imported attribute if target attribute is missing.Tor Egge2019-03-042-4/+21
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #8665 from ↵Yngve Aasheim2019-03-042-76/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/revert-8553-lesters/track-relevance-metrics Revert "Add relevance @k metric tracking"
| * | | | | | Revert "Add relevance @k metric tracking"Lester Solbakken2019-03-042-76/+2
|/ / / / / /
* | | | | | Merge pull request #8648 from vespa-engine/gjoranv/upgrade-javacc-pluginBjørn Christian Seime2019-03-041-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Upgrade ph-javacc-maven-plugin.
| * | | | | Upgrade ph-javacc-maven-plugin.gjoranv2019-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 4.1.2 is the first version annotated as thread safe, to get rid of the maven warnings.
* | | | | | Merge pull request #8644 from vespa-engine/arnej/add-network-ports-8Arne H Juul2019-03-0416-241/+484
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | rewrite port allocation
| * | | | | add info-level logging so we can verify that port re-use works as expectedArne Juul2019-03-041-1/+8
| | | | | |
| * | | | | add some documentation commentsArne Juul2019-03-041-0/+16
| | | | | |
| * | | | | refactor HostPorts usageArne Juul2019-03-047-25/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * instead of inheriting from HostPorts, make HostResource own an instance of it and redirect usage via ports() method.
| * | | | | rewrite port allocationArne Juul2019-03-0112-233/+452
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * refactor port allocation into its own class * add and use PortFinder to reuse saved allocations * remove superfluous PortReservation class * this should (hopefully) not change the actual port allocations, even when saved allocations are not present.