diff options
author | Harald Musum <musum@oath.com> | 2018-11-16 10:56:15 +0100 |
---|---|---|
committer | Harald Musum <musum@oath.com> | 2018-11-16 10:56:15 +0100 |
commit | 1e39aa8778ebdc4a6cb8004f6ea45f47ac5a8d60 (patch) | |
tree | 7f7b3dfdec91477c1dbb9529a56467cb3f6bab68 | |
parent | c22ffee2a5bcf8507b74a02cbe618c833e765497 (diff) |
Need to remove override annotation before method can be removed
-rw-r--r-- | config-model-api/src/main/java/com/yahoo/config/model/api/SuperModelProvider.java | 2 | ||||
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/SuperModelManager.java | 1 |
2 files changed, 1 insertions, 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; } |