diff options
| author | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-09-18 13:15:45 +0200 |
|---|---|---|
| committer | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-09-18 13:15:45 +0200 |
| commit | 6ba38b2278867c90248c715115e603c251da0efe (patch) | |
| tree | 17514547ceaf041ccd03989e4bbc41a0d4f173de /config-provisioning | |
| parent | c6913e47bd489c2d9c90656cc811e93ae07692e3 (diff) | |
Remove canonicalFlavor from Flavor
Diffstat (limited to 'config-provisioning')
| -rw-r--r-- | config-provisioning/abi-spec.json | 1 | ||||
| -rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/config-provisioning/abi-spec.json b/config-provisioning/abi-spec.json index 55b96cc9808..b41bf96332d 100644 --- a/config-provisioning/abi-spec.json +++ b/config-provisioning/abi-spec.json @@ -403,7 +403,6 @@ "public double getMinCpuCores()", "public com.yahoo.config.provision.Flavor$Type getType()", "public boolean isDocker()", - "public java.lang.String canonicalName()", "public int hashCode()", "public boolean equals(java.lang.Object)", "public java.lang.String toString()" diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java b/config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java index c430765ef1d..bc1f7fbf83b 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java @@ -116,9 +116,6 @@ public class Flavor { /** Convenience, returns getType() == Type.DOCKER_CONTAINER */ public boolean isDocker() { return type == Type.DOCKER_CONTAINER; } - // TODO: Remove after Vespa 6 is gone - public String canonicalName() { return name; } - @Override public int hashCode() { return Objects.hash(name, flavorOverrides); } |