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/91c9ae32 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/91c9ae32 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/91c9ae32 Branch: refs/heads/CURATOR-67 Commit: 91c9ae32e6df0cca2ff8e0b758f27e60f8768520 Parents: 35278cc f24e11b Author: Cam McKenzie <[email protected]> Authored: Mon Aug 4 10:42:07 2014 +1000 Committer: Cam McKenzie <[email protected]> Committed: Mon Aug 4 10:42:07 2014 +1000 ---------------------------------------------------------------------- .../x/discovery/ServiceDiscoveryBuilder.java | 7 +- .../details/TestServiceDiscoveryBuilder.java | 68 ++++++++++++++++++++ 2 files changed, 74 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
