summaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2019-05-09 12:54:00 +0200
committerHarald Musum <musum@verizonmedia.com>2019-05-09 12:54:00 +0200
commit79839f48f226100bc98dd5359b52229467988d92 (patch)
tree1b01b68ef5a281c0b0e045a6458ed8cb361097cb /config-model
parentea352d6c1a3a788f22e9c04839887b525d77051c (diff)
Remove noop: The model version will always be the version this code is compiled for
Diffstat (limited to 'config-model')
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java
index 71ce6492b09..d966211157b 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java
@@ -76,7 +76,6 @@ public class DomAdminV4Builder extends DomAdminBuilderBase {
private void assignLogserver(DeployState deployState, NodesSpecification nodesSpecification, Admin admin) {
if (nodesSpecification.count() > 1) throw new IllegalArgumentException("You can only request a single log server");
if (deployState.getProperties().applicationId().instance().isTester()) return; // No logserver is needed on tester applications
- if (deployState.getVespaVersion().getMajor() == 6) return; // Logserver is not supported on Vespa 6
if (nodesSpecification.isDedicated()) {
Collection<HostResource> hosts = allocateHosts(admin.getHostSystem(), "logserver", nodesSpecification);
if (hosts.isEmpty()) return; // No log server can be created (and none is needed)