From 9cf9e62f0d97a0530936c829062320859d3db06c Mon Sep 17 00:00:00 2001 From: jonmv Date: Fri, 15 Dec 2023 17:04:22 +0100 Subject: Revert "Merge pull request #29674 from vespa-engine/revert-29671-jonmv/reapply-zk-3.9.1" This reverts commit 28f8cf3e298d51ca703ceee36a992297d38637cc, reversing changes made to 3a9f89fe60e3420eed435daee435a4f8534c9512. --- zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java | 2 +- .../src/main/java/com/yahoo/vespa/zookeeper/client/package-info.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 zkfacade/src/main/java/com/yahoo/vespa/zookeeper/client/package-info.java (limited to 'zkfacade/src') diff --git a/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java b/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java index c372c69ad6b..169aee416e5 100644 --- a/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java +++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java @@ -8,7 +8,7 @@ import com.yahoo.concurrent.DaemonThreadFactory; import com.yahoo.path.Path; import com.yahoo.vespa.curator.recipes.CuratorCounter; import com.yahoo.vespa.defaults.Defaults; -import com.yahoo.vespa.zookeeper.VespaZooKeeperServer; +import com.yahoo.vespa.zookeeper.server.VespaZooKeeperServer; import com.yahoo.vespa.zookeeper.client.ZkClientConfigBuilder; import org.apache.curator.RetryPolicy; import org.apache.curator.framework.CuratorFramework; diff --git a/zkfacade/src/main/java/com/yahoo/vespa/zookeeper/client/package-info.java b/zkfacade/src/main/java/com/yahoo/vespa/zookeeper/client/package-info.java new file mode 100644 index 00000000000..7c81b651f30 --- /dev/null +++ b/zkfacade/src/main/java/com/yahoo/vespa/zookeeper/client/package-info.java @@ -0,0 +1,4 @@ +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +@ExportPackage +package com.yahoo.vespa.zookeeper.client; +import com.yahoo.osgi.annotation.ExportPackage; -- cgit v1.2.3