Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #8685 from ↵ | Bjørn Meland | 2019-03-05 | 1 | -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 Musum | 2019-03-05 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #8680 from ↵ | Jon Marius Venstad | 2019-03-05 | 1 | -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 7 | Jon Marius Venstad | 2019-03-05 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #8678 from ↵ | Harald Musum | 2019-03-05 | 7 | -21/+44 |
|\ | | | | | | | | | vespa-engine/hmusum/change-deactivate-to-return-not-found-exception Deactivate should return NotFoundException | ||||
| * | Deactivate should return NotFoundException | Harald Musum | 2019-03-05 | 7 | -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_2 | gjoranv | 2019-03-05 | 19 | -28/+82 |
|\ \ | | | | | | | Gjoranv/use container service type 2 | ||||
| * | | Import new package in config-model-api, | gjoranv | 2019-03-04 | 1 | -0/+1 |
| | | | |||||
| * | | Use ContainerServiceType in configserver. | gjoranv | 2019-03-04 | 11 | -19/+36 |
| | | | |||||
| * | | Add unit test to ensure names don't change. | gjoranv | 2019-03-04 | 1 | -0/+31 |
| | | | |||||
| * | | Rename name field to avoid confusion with Enum's 'name()' | gjoranv | 2019-03-04 | 2 | -4/+4 |
| | | | |||||
| * | | Move ContainerServiceType to config-model-api | gjoranv | 2019-03-04 | 6 | -5/+10 |
| | | | | | | | | | | | | .. to make it accessible without depending on config-model. | ||||
* | | | Merge pull request #8652 from vespa-engine/mpolden/limit-lb-service-fields | Martin Polden | 2019-03-05 | 13 | -151/+182 |
|\ \ \ | |_|/ |/| | | Limit fields that can be mutated by a LoadBalancerService | ||||
| * | | Simplify mock | Martin Polden | 2019-03-01 | 2 | -9/+8 |
| | | | |||||
| * | | Test load balancer re-activation | Martin Polden | 2019-03-01 | 2 | -0/+13 |
| | | | |||||
| * | | Simplify | Martin Polden | 2019-03-01 | 1 | -11/+9 |
| | | | |||||
| * | | Limit fields that can be mutated by a LoadBalancerService | Martin Polden | 2019-03-01 | 11 | -120/+153 |
| | | | |||||
| * | | Remove unnecessary default implementations | Martin Polden | 2019-03-01 | 2 | -14/+2 |
| | | | |||||
* | | | Merge pull request #8662 from ↵ | Harald Musum | 2019-03-05 | 1 | -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 needed | Harald Musum | 2019-03-04 | 1 | -4/+0 |
| | | | | |||||
* | | | | Merge pull request #8676 from ↵ | Håkon Hallingstad | 2019-03-04 | 5 | -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.values | Håkon Hallingstad | 2019-03-04 | 5 | -17/+14 |
| | | | | | |||||
* | | | | | Merge pull request #8674 from vespa-engine/gjoranv/setMillis-is-deprecated | Bjørn Christian Seime | 2019-03-04 | 7 | -38/+30 |
|\ \ \ \ \ | | | | | | | | | | | | | JDK 11: Replace LogRecord.setMillis with setInstant. | ||||
| * | | | | | JDK 11: Replace LogRecord.setMillis with setInstant. | gjoranv | 2019-03-04 | 7 | -38/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Suppress deprecation warnings locally instead of globally in controller-server. | ||||
* | | | | | | Merge pull request #8675 from ↵ | gjoranv | 2019-03-04 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/revert-8672-gjoranv/upgrade-dependency-plugin Revert "Use latest maven-dependency-plugin." | ||||
| * | | | | | | Revert "Use latest maven-dependency-plugin." | gjoranv | 2019-03-04 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #8667 from vespa-engine/hmusum/cleanup-config-server-tests | Harald Musum | 2019-03-04 | 2 | -96/+24 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Move the one useful test, remove the rest | ||||
| * | | | | | Fix assert | Harald Musum | 2019-03-04 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Move the one useful test, remove the rest | Harald Musum | 2019-03-04 | 3 | -97/+24 |
| | | | | | | |||||
* | | | | | | Merge pull request #8672 from vespa-engine/gjoranv/upgrade-dependency-plugin | Bjørn Christian Seime | 2019-03-04 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Use latest maven-dependency-plugin. | ||||
| * | | | | | | Use latest maven-dependency-plugin. | gjoranv | 2019-03-04 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #8669 from vespa-engine/bjorncs/tls-insecure-mixed-mode | Bjørn Christian Seime | 2019-03-04 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | Bjorncs/tls insecure mixed mode | ||||
| * | | | | | | Change default to 'tls_client_mixed_server' | Bjørn Christian Seime | 2019-03-04 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Stop reload task when there are no external references to the managers | Bjørn Christian Seime | 2019-03-04 | 2 | -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 Bratseth | 2019-03-04 | 18 | -81/+28 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/revert-8657-gjoranv/use-container-service-type Revert "Gjoranv/use container service type" | ||||
| * | | | | | | | Revert "Gjoranv/use container service type" | gjoranv | 2019-03-04 | 18 | -81/+28 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #8656 from vespa-engine/bjorncs/reloading-tls-context | Bjørn Christian Seime | 2019-03-04 | 2 | -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 managers | Bjørn Christian Seime | 2019-03-01 | 2 | -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 Baldersheim | 2019-03-04 | 2 | -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 Egge | 2019-03-04 | 2 | -4/+21 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge pull request #8665 from ↵ | Yngve Aasheim | 2019-03-04 | 2 | -76/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/revert-8553-lesters/track-relevance-metrics Revert "Add relevance @k metric tracking" | ||||
| * | | | | | | Revert "Add relevance @k metric tracking" | Lester Solbakken | 2019-03-04 | 2 | -76/+2 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #8648 from vespa-engine/gjoranv/upgrade-javacc-plugin | Bjørn Christian Seime | 2019-03-04 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Upgrade ph-javacc-maven-plugin. | ||||
| * | | | | | Upgrade ph-javacc-maven-plugin. | gjoranv | 2019-03-01 | 1 | -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-8 | Arne H Juul | 2019-03-04 | 16 | -241/+484 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | rewrite port allocation | ||||
| * | | | | | add info-level logging so we can verify that port re-use works as expected | Arne Juul | 2019-03-04 | 1 | -1/+8 |
| | | | | | | |||||
| * | | | | | add some documentation comments | Arne Juul | 2019-03-04 | 1 | -0/+16 |
| | | | | | | |||||
| * | | | | | refactor HostPorts usage | Arne Juul | 2019-03-04 | 7 | -25/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * instead of inheriting from HostPorts, make HostResource own an instance of it and redirect usage via ports() method. | ||||
| * | | | | | rewrite port allocation | Arne Juul | 2019-03-01 | 12 | -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. | ||||
* | | | | | | Merge pull request #8657 from vespa-engine/gjoranv/use-container-service-type | gjoranv | 2019-03-04 | 18 | -28/+81 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Gjoranv/use container service type |