diff options
| author | Jon Bratseth <bratseth@oath.com> | 2018-09-18 03:59:48 -0700 |
|---|---|---|
| committer | Jon Bratseth <bratseth@oath.com> | 2018-09-18 03:59:48 -0700 |
| commit | 17dc219ade1c241f7e40d5e0942d291219439792 (patch) | |
| tree | 2bf12f1cf62479a76a682f972b6de91fc8e2dc84 /config-provisioning | |
| parent | d382242496bc164c2eddd9e5d0d00c107a90eb9c (diff) | |
| parent | 59f42ff1e807e60361d13663e4039038cd239120 (diff) | |
Merge with master
Diffstat (limited to 'config-provisioning')
| -rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java | 2 | ||||
| -rw-r--r-- | config-provisioning/src/main/resources/configdefinitions/flavors.def | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java b/config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java index b0c04cea1b0..78507779585 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java @@ -26,7 +26,7 @@ public class Flavor { private final String description; private final boolean retired; private List<Flavor> replacesFlavors; - private int idealHeadroom; + private int idealHeadroom; // Note: Not used after Vespa 6.282 /** * Creates a Flavor, but does not set the replacesFlavors. diff --git a/config-provisioning/src/main/resources/configdefinitions/flavors.def b/config-provisioning/src/main/resources/configdefinitions/flavors.def index 57affc2f104..63b22958487 100644 --- a/config-provisioning/src/main/resources/configdefinitions/flavors.def +++ b/config-provisioning/src/main/resources/configdefinitions/flavors.def @@ -47,4 +47,5 @@ flavor[].description string default="" flavor[].retired bool default=false # The free capacity we would like to preserve for this flavor +# Note: Not used after Vespa 6.282 flavor[].idealHeadroom int default=0 |