diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2018-01-02 13:59:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-02 13:59:42 +0100 |
| commit | 9967338b1a3514830e92924d868046ee2cfc97db (patch) | |
| tree | 8f27590a3063bc592b85dc5d269e89491def2524 /controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiTest.java | |
| parent | e77379005bccd3d5009b1484038183a05856b4cd (diff) | |
| parent | c71969101b26dd4e29e5bef4c507550ebb47a9d9 (diff) | |
Merge pull request #4533 from vespa-engine/revert-4453-jvenstad/zone-cleanup-4
Revert "Jvenstad/zone cleanup 4"
Diffstat (limited to 'controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiTest.java')
| -rw-r--r-- | controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiTest.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiTest.java index 782dc6dba4f..9c20c470cf8 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiTest.java @@ -4,7 +4,7 @@ import com.yahoo.application.container.handler.Request; import com.yahoo.application.container.handler.Request.Method; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.RegionName; -import com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneId; +import com.yahoo.config.provision.ZoneId; import com.yahoo.text.Utf8; import com.yahoo.vespa.hosted.controller.ConfigServerProxyMock; import com.yahoo.vespa.hosted.controller.ZoneRegistryMock; |