This is an automated email from the ASF dual-hosted git repository. randgalt pushed a commit to branch CURATOR-549-zk36-persistent-watcher-bridge in repository https://gitbox.apache.org/repos/asf/curator.git
commit 6023688681c2a7d9e758851df30da528fa9010d9 Author: randgalt <[email protected]> AuthorDate: Sat Nov 2 11:40:44 2019 -0500 CURATOR-549 Bring Curator up to ZooKeeper 3.5.6 in preparation for supporting persistent recursive watchers while maintaining background compatability with previous versions of ZK. Added a new module to make sure we maintain compatibility with ZK 3.5.x. ZooKeeper 3.6.0 has some significant changes from previous versions. The reconfig APIs have moved into a new class, ZooKeeperAdmin. This class existed in 3.5.x but wasn't required. Now it is. A bunch of little things changed in the ZK server code [...] There is a new module, curator-test-zk35. It forces ZooKeeper 3.5.6 and performs selected tests from the other modules to ensure compatibility. Tests annotated with TestNG groups zk35 and zk35Compatibility are tested. Group zk36 is excluded. Note: these tests will only run from Maven. I don't think IntelliJ/Eclipse support the Maven syntax I used. Support persistent watchers in ZK 3.6+ while maintaining background compatability with previous versions of ZK. Added a new module to make sure we maintain comaptibility with ZK 3.5.x --- src/site/confluence/zk-compatibility.confluence | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/site/confluence/zk-compatibility.confluence b/src/site/confluence/zk-compatibility.confluence index 03a3ebe..a39fee4 100644 --- a/src/site/confluence/zk-compatibility.confluence +++ b/src/site/confluence/zk-compatibility.confluence @@ -13,7 +13,11 @@ Persistent/Recursive watchers. h2. ZooKeeper 3.5.x and ZooKeeper 3.4.x +<<<<<<< HEAD Curator supports earlier versions of ZooKeeper in a soft\-compatibility mode. To use this mode +======= +Curator 4.0 supports earlier versions of ZooKeeper in a soft\-compatibility mode. To use this mode +>>>>>>> CURATOR-549 you must exclude ZooKeeper when adding Curator to your dependency management tool. _Maven_
