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/src/main/resources/configdefinitions/flavors.def | |
parent | d382242496bc164c2eddd9e5d0d00c107a90eb9c (diff) | |
parent | 59f42ff1e807e60361d13663e4039038cd239120 (diff) |
Merge with master
Diffstat (limited to 'config-provisioning/src/main/resources/configdefinitions/flavors.def')
-rw-r--r-- | config-provisioning/src/main/resources/configdefinitions/flavors.def | 1 |
1 files changed, 1 insertions, 0 deletions
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 |