diff options
author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2024-04-03 17:00:20 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-03 17:00:20 +0200 |
commit | f57333f6f657518f82246a08bafdb659c1fc68db (patch) | |
tree | 0ed3c345e3589c1178c534b95886e4153bffd8ce /config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java | |
parent | 439ec806d3f78dc3cb74f02504b51e53d30c6cac (diff) | |
parent | 1a9e7c845a524b79c1122f8007d00d2d5bb45ca9 (diff) |
Merge pull request #30804 from vespa-engine/revert-30797-hakonhall/disable-proxy-protocol-on-jdisc-containers-in-azure-2
Revert "Disable proxy protocol on jdisc containers in Azure, #2"
Diffstat (limited to 'config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java')
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java b/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java index 73c6010f514..5ef42d12dc1 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java @@ -54,6 +54,11 @@ public class Zone { this.region = region; } + // TODO(mpolden): For compatibility with older config models. Remove when versions < 8.76 are gone + public Cloud getCloud() { + return cloud(); + } + /** Returns the current cloud */ public Cloud cloud() { return cloud; } @@ -97,10 +102,5 @@ public class Zone { return Objects.hash(environment, region); } - // TODO(mpolden): For compatibility with older config models. Remove when versions < 8.327 are gone - @Deprecated(forRemoval = true) - public Cloud getCloud() { - return cloud(); - } } |