diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2023-12-15 15:31:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-15 15:31:56 +0100 |
| commit | 76a89eb98d9e5ce63cd7a725d3549c38d0b681e8 (patch) | |
| tree | 5767022d30c0bd4de34a6671e514e1e5c7fb6aea /zkfacade/src/main | |
| parent | 3a9f89fe60e3420eed435daee435a4f8534c9512 (diff) | |
Revert "Jonmv/reapply zk 3.9.1"
Diffstat (limited to 'zkfacade/src/main')
| -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; |