diff options
author | Jon Bratseth <jonbratseth@yahoo.com> | 2017-08-30 07:30:05 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-30 07:30:05 +0200 |
commit | 043491a7791cd028d6866286598ca7dbe0b8adca (patch) | |
tree | 1a850c8f3c076a6f325efd07b0c62d0195e5e608 /config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java | |
parent | 58a07e57da6e15a7146af56a368f0954e7a34d2a (diff) | |
parent | 36e32353aad750fcab9568e778406e6d7079a3c7 (diff) |
Merge pull request #3234 from vespa-engine/bratseth/store-provisioninfo-without-version
Bratseth/store provisioninfo without version
Diffstat (limited to 'config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java')
-rw-r--r-- | config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java index 5afc570d81b..5b79415c132 100644 --- a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java +++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java @@ -17,7 +17,7 @@ import java.util.Set; /** * Model context containing state provided to model factories. * - * @author lulf + * @author Ulf Lilleengen */ public interface ModelContext { @@ -31,11 +31,6 @@ public interface ModelContext { Properties properties(); default Optional<File> appDir() { return Optional.empty();} - /** @deprecated TODO: Remove this when no config models older than 6.98 are used */ - @SuppressWarnings("unused") - @Deprecated - default Optional<com.yahoo.config.provision.Version> vespaVersion() { return Optional.empty(); } - /** The Vespa version this model is built for */ Version modelVespaVersion(); @@ -50,4 +45,5 @@ public interface ModelContext { Zone zone(); Set<Rotation> rotations(); } + } |