diff options
3 files changed, 3 insertions, 5 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java index 784e5e77eb5..01bdfa34bc1 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java @@ -425,7 +425,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { } private static void addHostedImplicitHttpIfNotPresent(ApplicationContainerCluster cluster) { - if(cluster.getHttp() == null) { + if (cluster.getHttp() == null) { cluster.setHttp(new Http(new FilterChains(cluster))); } JettyHttpServer httpServer = cluster.getHttp().getHttpServer().orElse(null); diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java index 6e09ed4fe5e..0fd7c55147f 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java @@ -436,9 +436,7 @@ public class ContentCluster extends AbstractConfigProducer implements new ClusterControllerContainer(clusterControllers, index, multitenant, deployState); clusterControllerContainer.setHostResource(host); clusterControllerContainer.initService(deployState.getDeployLogger()); - clusterControllerContainer.setProp("clustertype", "admin") - .setProp("clustername", clusterControllers.getName()) - .setProp("index", String.valueOf(index)); + clusterControllerContainer.setProp("clustertype", "admin"); containers.add(clusterControllerContainer); ++index; } diff --git a/serviceview/src/main/java/com/yahoo/vespa/serviceview/bindings/ServicePort.java b/serviceview/src/main/java/com/yahoo/vespa/serviceview/bindings/ServicePort.java index 6fd2f22528a..98db96a902a 100644 --- a/serviceview/src/main/java/com/yahoo/vespa/serviceview/bindings/ServicePort.java +++ b/serviceview/src/main/java/com/yahoo/vespa/serviceview/bindings/ServicePort.java @@ -10,7 +10,7 @@ import com.google.common.base.Splitter; * View of {@link com.yahoo.cloud.config.ModelConfig.Hosts.Services.Ports}. * * @author mortent - * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> + * @author Steinar Knutsen */ @JsonIgnoreProperties(value = { "splitOnSpace" }, ignoreUnknown = true) public class ServicePort { |