Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/curator
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/ad6c23ad Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/ad6c23ad Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/ad6c23ad Branch: refs/heads/master Commit: ad6c23adcd504ca98afe07c3ddaed92ae35a1c0d Parents: 9eafd05 3c1a4ed Author: randgalt <[email protected]> Authored: Thu Aug 7 21:09:02 2014 -0500 Committer: randgalt <[email protected]> Committed: Thu Aug 7 21:09:02 2014 -0500 ---------------------------------------------------------------------- .../org/apache/curator/ConnectionState.java | 1 - .../apache/curator/CuratorZookeeperClient.java | 5 +- .../framework/imps/CuratorFrameworkImpl.java | 5 +- .../recipes/leader/LeaderSelector.java | 1 - .../locks/StandardLockInternalsDriver.java | 1 - .../recipes/nodes/PersistentEphemeralNode.java | 5 +- .../x/discovery/ServiceDiscoveryBuilder.java | 12 +++- .../details/TestServiceDiscoveryBuilder.java | 67 ++++++++++++++++++++ 8 files changed, 81 insertions(+), 16 deletions(-) ----------------------------------------------------------------------
