diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2023-12-15 10:22:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-15 10:22:52 +0100 |
| commit | 36d1ecc19daff6e8d562ee8110965d7387430150 (patch) | |
| tree | ecea87acf4f87655088abb51e6dedd848dcf94b7 /zkfacade/src | |
| parent | 954785e4eb91286bd166c304e98042ec63b7eb84 (diff) | |
Revert "Revert "Revert "Jonmv/zk 3.9.1 clients 2"""
Diffstat (limited to 'zkfacade/src')
| -rw-r--r-- | zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java | 2 | ||||
| -rw-r--r-- | zkfacade/src/main/java/com/yahoo/vespa/zookeeper/client/package-info.java | 4 |
2 files changed, 1 insertions, 5 deletions
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 169aee416e5..c372c69ad6b 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.server.VespaZooKeeperServer; +import com.yahoo.vespa.zookeeper.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 deleted file mode 100644 index 7c81b651f30..00000000000 --- a/zkfacade/src/main/java/com/yahoo/vespa/zookeeper/client/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -// 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; |