diff options
author | Harald Musum <musum@yahoo-inc.com> | 2016-11-23 13:52:02 +0100 |
---|---|---|
committer | Harald Musum <musum@yahoo-inc.com> | 2016-11-23 13:52:02 +0100 |
commit | cfa979971e676d85481570582606acda8cc7ac7b (patch) | |
tree | 3678ebec0c2aac1cad2c4fec5bafc910bcaf6fcd /config-provisioning/src | |
parent | 24ce067331f3546cfa0060e9e8427777e884e5cb (diff) |
Remove special handling of deployment of routing application
* Routing application uses nodes from node repo in all zones now,
handle as other applications
VESPA-5118
Diffstat (limited to 'config-provisioning/src')
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/ApplicationId.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/ApplicationId.java b/config-provisioning/src/main/java/com/yahoo/config/provision/ApplicationId.java index 3c465db5e5c..af6f67040cb 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/ApplicationId.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/ApplicationId.java @@ -62,6 +62,8 @@ public final class ApplicationId implements Comparable<ApplicationId> { this.serializedForm = toSerializedForm(); } + // TODO: Remove code between lines with ----------- when oldest config model used is 6.49. + /* ------------------- */ public static final TenantName HOSTED_VESPA_TENANT = TenantName.from("hosted-vespa"); // TODO: Remove references to routing application, or rename them to zone // application, once everything (like Chef recipes) refers to the zone @@ -81,6 +83,7 @@ public final class ApplicationId implements Comparable<ApplicationId> { (ROUTING_APPLICATION.equals(application) || ZONE_APPLICATION.equals(application)); } + /* ------------------- */ public static ApplicationId from(TenantName tenant, ApplicationName application, InstanceName instanceName) { return new ApplicationId(tenant, application, instanceName); |