diff options
author | jonmv <venstad@gmail.com> | 2023-12-15 10:39:57 +0100 |
---|---|---|
committer | jonmv <venstad@gmail.com> | 2023-12-15 10:39:57 +0100 |
commit | 01b40d7e149df23c84a7a13560208e862480ce3a (patch) | |
tree | 38fbe525516be447347fded3d437854098086a5c /clustercontroller-reindexer | |
parent | 9c8ba2608384ee79e143babd1e5a18a62166541f (diff) |
Revert "Merge pull request #29669 from vespa-engine/revert-29662-revert-29661-revert-29658-jonmv/zk-3.9.1-clients-2"
This reverts commit 9c8ba2608384ee79e143babd1e5a18a62166541f, reversing
changes made to 954785e4eb91286bd166c304e98042ec63b7eb84.
Diffstat (limited to 'clustercontroller-reindexer')
2 files changed, 2 insertions, 2 deletions
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; |