aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config-model-api/src/main/java/com/yahoo/config/model/api/container/ContainerServiceType.java6
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/container/Container.java2
2 files changed, 4 insertions, 4 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/container/ContainerServiceType.java b/config-model-api/src/main/java/com/yahoo/config/model/api/container/ContainerServiceType.java
index 5d168d2882a..0b521881838 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/container/ContainerServiceType.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/container/ContainerServiceType.java
@@ -12,10 +12,10 @@ public enum ContainerServiceType {
LOGSERVER_CONTAINER("logserver-container"),
METRICS_PROXY_CONTAINER("metrics-proxy-container");
- public final String name;
+ public final String serviceName;
- ContainerServiceType(String name) {
- this.name = name;
+ ContainerServiceType(String serviceName) {
+ this.serviceName = serviceName;
}
}
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java b/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java
index 2ce954e4a0d..91f46c013e9 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java
@@ -198,7 +198,7 @@ public abstract class Container extends AbstractService implements
if (myServiceType == null) {
myServiceType = myServiceType();
}
- return myServiceType.name;
+ return myServiceType.serviceName;
}
/** Subclasses must implement this for a custom service name. */