Merge branch 'fix/CURATOR-408-close-with-timeout' of github.com:eolivelli/curator into CURATOR-408
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/cfea1fb0 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/cfea1fb0 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/cfea1fb0 Branch: refs/heads/master Commit: cfea1fb07bba7d367edd4a30fac35d31d9a1dd6d Parents: ba8ade0 fe2c7c4 Author: randgalt <[email protected]> Authored: Sun Jun 24 09:13:19 2018 -0500 Committer: randgalt <[email protected]> Committed: Sun Jun 24 09:13:19 2018 -0500 ---------------------------------------------------------------------- .../java/org/apache/curator/ConnectionState.java | 9 ++++++--- .../apache/curator/CuratorZookeeperClient.java | 19 +++++++++++++++---- .../java/org/apache/curator/HandleHolder.java | 10 +++++----- .../state/TestConnectionStateManager.java | 18 ++++++++++++++++++ pom.xml | 2 +- 5 files changed, 45 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
