diff options
| author | Øyvind Grønnesby <oyving@verizonmedia.com> | 2020-09-30 11:08:36 +0200 |
|---|---|---|
| committer | Øyvind Grønnesby <oyving@verizonmedia.com> | 2020-09-30 11:08:36 +0200 |
| commit | ef52f22d1a495ccd3497384d19feeebe70439378 (patch) | |
| tree | 3d456e13abaa491e5c9f1439de592a08a28881e0 /config-model-api | |
| parent | 68176288649b5ebc3bbf00ae934875c17b9a75b7 (diff) | |
| parent | bd6373019e2844f0c20cc1f7696a3e017be9c08c (diff) | |
Merge remote-tracking branch 'origin/master' into ogronnesby/quota-decimal
Diffstat (limited to 'config-model-api')
| -rw-r--r-- | config-model-api/src/main/java/com/yahoo/config/model/api/ConfigChangeAction.java | 4 | ||||
| -rw-r--r-- | config-model-api/src/main/java/com/yahoo/config/model/api/Quota.java | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigChangeAction.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigChangeAction.java index ea4b6a2b02d..2a798839752 100644 --- a/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigChangeAction.java +++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigChangeAction.java @@ -39,6 +39,8 @@ public interface ConfigChangeAction { boolean allowed(); /** Returns whether this change should be ignored for internal redeploy */ - boolean ignoreForInternalRedeploy(); + default boolean ignoreForInternalRedeploy() { + return false; + }; } diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/Quota.java b/config-model-api/src/main/java/com/yahoo/config/model/api/Quota.java index 3a57e5bb66c..01ed33e023e 100644 --- a/config-model-api/src/main/java/com/yahoo/config/model/api/Quota.java +++ b/config-model-api/src/main/java/com/yahoo/config/model/api/Quota.java @@ -18,7 +18,10 @@ import java.util.Optional; public class Quota { private static final Quota UNLIMITED = new Quota(Optional.empty(), Optional.empty()); + /** The max size of a cluster inside application */ private final Optional<Integer> maxClusterSize; + + /** The max budget in dollars per hour */ private final Optional<BigDecimal> budget; // TODO: Remove constructor once Vespa < 7.300 is gone from production |