Merge branch 'CURATOR-67' of https://github.com/madrob/curator into CURATOR-67
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/756fd5fd Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/756fd5fd Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/756fd5fd Branch: refs/heads/master Commit: 756fd5fd94ac7de5c7600bc4e67a9e158310836b Parents: f24e11b c744c64 Author: Cam McKenzie <[email protected]> Authored: Tue Aug 5 08:54:12 2014 +1000 Committer: Cam McKenzie <[email protected]> Committed: Tue Aug 5 08:54:12 2014 +1000 ---------------------------------------------------------------------- .../x/discovery/ServiceDiscoveryBuilder.java | 5 +- .../discovery/TestServiceDiscoveryBuilder.java | 71 ++++++++++++++++++++ 2 files changed, 74 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
