diff options
author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2020-11-10 16:46:39 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-10 16:46:39 +0100 |
commit | f2e4fbf27fb0dc116fea638e72178f5b4578b654 (patch) | |
tree | f1d7a35a785d67172a1cfeae75ef4aeefaea8973 /config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2Builder.java | |
parent | 319c8a216747b7d47d814cad5a8dac28d8d1c280 (diff) |
Revert "Bjorncs/reindexing cluster controller in config model"
Diffstat (limited to 'config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2Builder.java')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2Builder.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2Builder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2Builder.java index 3719c8a43a2..706311dcdbf 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2Builder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2Builder.java @@ -7,6 +7,7 @@ import com.yahoo.config.model.api.ConfigServerSpec; import com.yahoo.config.model.deploy.DeployState; import com.yahoo.config.model.producer.AbstractConfigProducer; import com.yahoo.text.XML; +import java.util.logging.Level; import com.yahoo.vespa.model.SimpleConfigProducer; import com.yahoo.vespa.model.admin.Admin; import com.yahoo.vespa.model.admin.Configserver; @@ -18,8 +19,8 @@ import com.yahoo.vespa.model.admin.clustercontroller.ClusterControllerContainerC import com.yahoo.vespa.model.builder.xml.dom.VespaDomBuilder.DomConfigProducerBuilder; import org.w3c.dom.Element; -import java.util.ArrayList; import java.util.List; +import java.util.ArrayList; import java.util.Objects; import java.util.logging.Level; @@ -207,7 +208,7 @@ public class DomAdminV2Builder extends DomAdminBuilderBase { @Override protected ClusterControllerContainer doBuild(DeployState deployState, AbstractConfigProducer parent, Element spec) { - return new ClusterControllerContainer(parent, i, runStandaloneZooKeeper, deployState.isHosted(), /*reindexingContext*/null); + return new ClusterControllerContainer(parent, i, runStandaloneZooKeeper, deployState.isHosted()); } } } |