From 1e39aa8778ebdc4a6cb8004f6ea45f47ac5a8d60 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Fri, 16 Nov 2018 10:56:15 +0100 Subject: Need to remove override annotation before method can be removed --- .../src/main/java/com/yahoo/config/model/api/SuperModelProvider.java | 2 +- .../src/main/java/com/yahoo/vespa/config/server/SuperModelManager.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/SuperModelProvider.java b/config-model-api/src/main/java/com/yahoo/config/model/api/SuperModelProvider.java index 36702f6e97c..5b636385b6a 100644 --- a/config-model-api/src/main/java/com/yahoo/config/model/api/SuperModelProvider.java +++ b/config-model-api/src/main/java/com/yahoo/config/model/api/SuperModelProvider.java @@ -13,6 +13,6 @@ public interface SuperModelProvider { */ SuperModel snapshot(SuperModelListener listener); - // TODO: Remove when 6.306 is latest version in use + // TODO: Remove when 6.313 is latest version in use Zone getZone(); } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/SuperModelManager.java b/configserver/src/main/java/com/yahoo/vespa/config/server/SuperModelManager.java index 33099e3a36c..542d0b3f387 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/SuperModelManager.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/SuperModelManager.java @@ -64,7 +64,6 @@ public class SuperModelManager implements SuperModelProvider { return superModelConfigProvider.getSuperModel(); } - @Override public Zone getZone() { return zone; } -- cgit v1.2.3