Merge branch 'CURATOR-71'
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/3c1a4edc Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/3c1a4edc Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/3c1a4edc Branch: refs/heads/master Commit: 3c1a4edc21431668ca9ca8bd4e8a782a2fd5d1b7 Parents: adb93c0 a83bf36 Author: Cam McKenzie <[email protected]> Authored: Tue Aug 5 13:48:10 2014 +1000 Committer: Cam McKenzie <[email protected]> Committed: Tue Aug 5 13:48:10 2014 +1000 ---------------------------------------------------------------------- .../src/main/java/org/apache/curator/ConnectionState.java | 1 - .../main/java/org/apache/curator/CuratorZookeeperClient.java | 5 ++--- .../org/apache/curator/framework/imps/CuratorFrameworkImpl.java | 5 ++--- .../apache/curator/framework/recipes/leader/LeaderSelector.java | 1 - .../framework/recipes/locks/StandardLockInternalsDriver.java | 1 - .../framework/recipes/nodes/PersistentEphemeralNode.java | 5 +---- 6 files changed, 5 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
