Merge pull request #30805 from vespa-engine/revert-30804-revert-30797-hakonhall/disable-proxy-protocol-on-jdisc-containers-in-azure-2v8.326.37

Revert "Revert "Disable proxy protocol on jdisc containers in Azure, #2""

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 5ef42d12dc1..73c6010f514 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,11 +54,6 @@ 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; }
 
@@ -102,5 +97,10 @@ 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();
+    }
 }