diff options
| author | Harald Musum <musum@oath.com> | 2018-09-15 09:04:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-15 09:04:01 +0200 |
| commit | 71a9b65e8c7f0f24a96a6779432806d10a3d8984 (patch) | |
| tree | 96761d501a40d43738275e4f920168e5ccc1cea2 /config-provisioning | |
| parent | 68a41c0ddd5af11d16e6bcbc7b6930e4187a3892 (diff) | |
| parent | fc36939b93ab83e8f1082019f8d80f6c9e671b17 (diff) | |
Merge pull request #6748 from vespa-engine/hmusum/remove-ideal-headroom-for-docker-hosts
Remove use of ideal headroom when allocating, has not been used for a…
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 |