diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2022-03-31 14:16:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-31 14:16:15 +0200 |
| commit | 965c1eb15a0f07029289552e8e1616d2fda2b194 (patch) | |
| tree | 2fc8716a590a564c2d7e01234a24dfcc9614a078 /controller-server | |
| parent | 71c2103ae118c0efc705dc1eb5bc89bc9a28b8d9 (diff) | |
| parent | f52ebfd454eb7b3c334e03b5c0ab47d4cb753e1f (diff) | |
Merge pull request #21893 from vespa-engine/jonmv/misc-3
Jonmv/misc 3
Diffstat (limited to 'controller-server')
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Controller.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Controller.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Controller.java index 16e1a2db2e4..6afeab9b4e6 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Controller.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Controller.java @@ -7,11 +7,11 @@ import com.yahoo.component.Version; import com.yahoo.component.Vtag; import com.yahoo.concurrent.maintenance.JobControl; import com.yahoo.config.provision.CloudName; -import com.yahoo.config.provision.HostName; import com.yahoo.config.provision.SystemName; import com.yahoo.config.provision.zone.ZoneApi; import com.yahoo.container.jdisc.secretstore.SecretStore; import com.yahoo.jdisc.Metric; +import com.yahoo.net.HostName; import com.yahoo.vespa.curator.Lock; import com.yahoo.vespa.flags.FlagSource; import com.yahoo.vespa.hosted.controller.api.integration.ServiceRegistry; @@ -98,7 +98,7 @@ public class Controller extends AbstractComponent { public Controller(CuratorDb curator, RotationsConfig rotationsConfig, AccessControl accessControl, FlagSource flagSource, MavenRepository mavenRepository, ServiceRegistry serviceRegistry, Metric metric, SecretStore secretStore, ControllerConfig controllerConfig) { - this(curator, rotationsConfig, accessControl, com.yahoo.net.HostName::getLocalhost, flagSource, + this(curator, rotationsConfig, accessControl, HostName::getLocalhost, flagSource, mavenRepository, serviceRegistry, metric, secretStore, controllerConfig, Sleeper.DEFAULT); } @@ -279,8 +279,8 @@ public class Controller extends AbstractComponent { } /** Returns the hostname of this controller */ - public HostName hostname() { - return HostName.from(hostnameSupplier.get()); + public com.yahoo.config.provision.HostName hostname() { + return com.yahoo.config.provision.HostName.from(hostnameSupplier.get()); } public SystemName system() { |