diff options
| author | Morten Tokle <morten.tokle@gmail.com> | 2018-11-16 12:27:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-16 12:27:17 +0100 |
| commit | cae7456c12e1bd3d22c0900772f9e53d1c14b2d5 (patch) | |
| tree | 3230e31c83d1aa8320abb1087f75200a88574bce | |
| parent | 6f6c10d4fdee3cdb9dcca7326f9237f4fed94f2e (diff) | |
| parent | 1e39aa8778ebdc4a6cb8004f6ea45f47ac5a8d60 (diff) | |
Merge pull request #7678 from vespa-engine/hmusum/remove-override-annotation
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; } |