aboutsummaryrefslogtreecommitdiffstats
path: root/config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java
diff options
context:
space:
mode:
authorHarald Musum <musum@oath.com>2018-10-04 08:27:22 +0200
committerGitHub <noreply@github.com>2018-10-04 08:27:22 +0200
commitc977fba40838326812d99a0ae3aba078662771d8 (patch)
tree2472472d1f73f0d75faf060bec07e2a3b996ee2c /config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java
parent9bff51eb4a6a05c971f07a1df6574a7af3af677b (diff)
Revert "Balder/reduce usage of complex deploystate"
Diffstat (limited to 'config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java')
-rw-r--r--config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java b/config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java
index da79e34b3ad..7a5969585e9 100644
--- a/config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java
+++ b/config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java
@@ -2,7 +2,6 @@
package com.yahoo.config.model;
import com.yahoo.cloud.config.*;
-import com.yahoo.config.model.deploy.DeployState;
import com.yahoo.config.provision.ApplicationId;
import com.yahoo.config.provision.Version;
import com.yahoo.vespa.config.content.LoadTypeConfig;
@@ -126,11 +125,11 @@ public class ApplicationConfigProducerRoot extends AbstractConfigProducer<Abstra
}
// TODO: Do this as another config model depending on the other models
- public void setupRouting(DeployState deployState, VespaModel vespaModel, ConfigModelRepo configModels) {
+ public void setupRouting(VespaModel vespaModel, ConfigModelRepo configModels) {
if (admin != null) {
Routing routing = configModels.getRouting();
if (routing == null) {
- routing = new Routing(ConfigModelContext.create(deployState, vespaModel, configModels, this, "routing"));
+ routing = new Routing(ConfigModelContext.create(vespaModel, configModels, this, "routing"));
configModels.add(routing);
}
this.routing = routing;