diff options
| author | Jon Marius Venstad <jonmv@gmail.com> | 2022-04-07 15:31:44 +0200 |
|---|---|---|
| committer | Jon Marius Venstad <jonmv@gmail.com> | 2022-04-07 15:31:44 +0200 |
| commit | c00d72bc4cdde1bde164e6174ab854f1ef4e7bfd (patch) | |
| tree | 1cfe2296adc3ef7324b0c3238a5b7f0dc04ba7bb /controller-api | |
| parent | f2850bb028ff11c91adb370f5bd03899ac5022ec (diff) | |
Resolve conflicts
Diffstat (limited to 'controller-api')
| -rw-r--r-- | controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServer.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServer.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServer.java index 6387a35d026..37acc042c34 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServer.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServer.java @@ -4,8 +4,8 @@ package com.yahoo.vespa.hosted.controller.api.integration.configserver; import com.yahoo.component.Version; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.zone.ZoneId; -import com.yahoo.net.DomainName; -import com.yahoo.restapi.HttpURL.Path; +import ai.vespa.http.DomainName; +import ai.vespa.http.HttpURL.Path; import com.yahoo.vespa.flags.json.FlagData; import com.yahoo.vespa.hosted.controller.api.application.v4.model.ClusterMetrics; import com.yahoo.vespa.hosted.controller.api.application.v4.model.DeploymentData; |