diff options
author | Kristian Aune <kraune@verizonmedia.com> | 2022-06-16 15:46:50 +0200 |
---|---|---|
committer | Kristian Aune <kraune@verizonmedia.com> | 2022-06-16 15:46:50 +0200 |
commit | 0ab2071f92d1b181c12dabb8c53c4653c09645c8 (patch) | |
tree | 9be0107f29a21d276165f27dc7ab7ac7b0a259c5 /hosted-zone-api | |
parent | cb2180e9d2d2411832521f00e1ae1ad9e44026d6 (diff) | |
parent | 69a3890ae5292eaaa527976c43535373d489ab00 (diff) |
Resolve merge conflict
Diffstat (limited to 'hosted-zone-api')
-rw-r--r-- | hosted-zone-api/abi-spec.json | 2 | ||||
-rw-r--r-- | hosted-zone-api/pom.xml | 2 | ||||
-rw-r--r-- | hosted-zone-api/src/main/java/ai/vespa/cloud/SystemInfo.java | 6 | ||||
-rw-r--r-- | hosted-zone-api/src/main/java/ai/vespa/cloud/ZoneInfo.java | 6 |
4 files changed, 1 insertions, 15 deletions
diff --git a/hosted-zone-api/abi-spec.json b/hosted-zone-api/abi-spec.json index 11375d97972..826f731b4e0 100644 --- a/hosted-zone-api/abi-spec.json +++ b/hosted-zone-api/abi-spec.json @@ -73,7 +73,6 @@ ], "methods": [ "public void <init>(ai.vespa.cloud.ApplicationId, ai.vespa.cloud.Zone, ai.vespa.cloud.Cluster, ai.vespa.cloud.Node)", - "public void <init>(ai.vespa.cloud.Zone, ai.vespa.cloud.Cluster, ai.vespa.cloud.Node)", "public ai.vespa.cloud.ApplicationId application()", "public ai.vespa.cloud.Zone zone()", "public ai.vespa.cloud.Cluster cluster()", @@ -106,7 +105,6 @@ ], "methods": [ "public void <init>(ai.vespa.cloud.ApplicationId, ai.vespa.cloud.Zone)", - "public void <init>(ai.vespa.cloud.Zone)", "public ai.vespa.cloud.ApplicationId application()", "public ai.vespa.cloud.Zone zone()", "public static ai.vespa.cloud.ZoneInfo defaultInfo()" diff --git a/hosted-zone-api/pom.xml b/hosted-zone-api/pom.xml index ea3b035618b..87012df8479 100644 --- a/hosted-zone-api/pom.xml +++ b/hosted-zone-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> - <version>7-SNAPSHOT</version> + <version>8-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>hosted-zone-api</artifactId> diff --git a/hosted-zone-api/src/main/java/ai/vespa/cloud/SystemInfo.java b/hosted-zone-api/src/main/java/ai/vespa/cloud/SystemInfo.java index 3789c49fe82..752e78b580f 100644 --- a/hosted-zone-api/src/main/java/ai/vespa/cloud/SystemInfo.java +++ b/hosted-zone-api/src/main/java/ai/vespa/cloud/SystemInfo.java @@ -23,12 +23,6 @@ public class SystemInfo { this.node = Objects.requireNonNull(node, "Node cannot be null"); } - /** @deprecated pass an application id */ - @Deprecated // Remove on Vespa 8 - public SystemInfo(Zone zone, Cluster cluster, Node node) { - this(new ApplicationId("default", "default", "default"), zone, cluster, node); - } - /** Returns the application this is running as a part of */ public ApplicationId application() { return application; } diff --git a/hosted-zone-api/src/main/java/ai/vespa/cloud/ZoneInfo.java b/hosted-zone-api/src/main/java/ai/vespa/cloud/ZoneInfo.java index e4b69caa940..f29b921115e 100644 --- a/hosted-zone-api/src/main/java/ai/vespa/cloud/ZoneInfo.java +++ b/hosted-zone-api/src/main/java/ai/vespa/cloud/ZoneInfo.java @@ -25,12 +25,6 @@ public class ZoneInfo { this.zone = Objects.requireNonNull(zone, "Zone cannot be null!"); } - /** @deprecated pass an application id */ - @Deprecated // Remove on Vespa 8 - public ZoneInfo(Zone zone) { - this(new ApplicationId("default", "default", "default"), zone); - } - /** Returns the application this is running as part of */ public ApplicationId application() { return application; } |