From 5eb199b2b5670458324c4e6073a5a810bee33364 Mon Sep 17 00:00:00 2001 From: jonmv Date: Sun, 17 Dec 2023 12:45:29 +0100 Subject: Revert "Merge pull request #29683 from vespa-engine/revert-29678-jonmv/reapply-zk-3.9.1" This reverts commit c8ece8b229362c7bf725e4433ef4fec86024cd29, reversing changes made to d42b67f0fe821d122548a345f27fda7f9c9c9d10. --- .../src/main/java/ai/vespa/reindexing/ReindexingMaintainer.java | 2 +- .../src/main/java/ai/vespa/reindexing/http/ReindexingV1ApiHandler.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'clustercontroller-reindexer') diff --git a/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/ReindexingMaintainer.java b/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/ReindexingMaintainer.java index 63f7c914fad..3e0772234a5 100644 --- a/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/ReindexingMaintainer.java +++ b/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/ReindexingMaintainer.java @@ -16,7 +16,7 @@ import com.yahoo.net.HostName; import com.yahoo.vespa.config.content.AllClustersBucketSpacesConfig; import com.yahoo.vespa.config.content.reindexing.ReindexingConfig; import com.yahoo.vespa.curator.Curator; -import com.yahoo.vespa.zookeeper.VespaZooKeeperServer; +import com.yahoo.vespa.zookeeper.server.VespaZooKeeperServer; import java.time.Clock; import java.time.Duration; diff --git a/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/http/ReindexingV1ApiHandler.java b/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/http/ReindexingV1ApiHandler.java index 29f009cd61d..ca9f317e840 100644 --- a/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/http/ReindexingV1ApiHandler.java +++ b/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/http/ReindexingV1ApiHandler.java @@ -20,7 +20,7 @@ import com.yahoo.slime.Cursor; import com.yahoo.slime.Slime; import com.yahoo.vespa.config.content.reindexing.ReindexingConfig; import com.yahoo.vespa.curator.Curator; -import com.yahoo.vespa.zookeeper.VespaZooKeeperServer; +import com.yahoo.vespa.zookeeper.server.VespaZooKeeperServer; import java.util.Collection; import java.util.List; -- cgit v1.2.3