diff options
author | Øyvind Grønnesby <oyving@verizonmedia.com> | 2021-02-09 09:38:02 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-09 09:38:02 +0100 |
commit | 95756ebe69d5e79b7419570f9d20cb590b1f5a92 (patch) | |
tree | faeb49b5be1aa2f7a63d98a6afa65c902ea9f3b4 /controller-api | |
parent | eb847b3bd3730a52284ea385701dd96899f61e44 (diff) | |
parent | b19b6ba1f27f8295f965555dd4c166d8f2334404 (diff) |
Merge pull request #16438 from vespa-engine/andreer/exclude-temporary-deployments-when-calculating-quota
exclude temporary deployments when calculating quota
Diffstat (limited to 'controller-api')
-rw-r--r-- | controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/Quota.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/Quota.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/Quota.java index feedf1be04f..0f0aa05264d 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/Quota.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/Quota.java @@ -76,7 +76,8 @@ public class Quota { if (o == null || getClass() != o.getClass()) return false; Quota quota = (Quota) o; return maxClusterSize.equals(quota.maxClusterSize) && - budget.equals(quota.budget); + this.budget.map(BigDecimal::stripTrailingZeros).equals( + quota.budget.map(BigDecimal::stripTrailingZeros)); } @Override |