Merge branch 'master' into CURATOR-421
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/7a60af0d Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/7a60af0d Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/7a60af0d Branch: refs/heads/master Commit: 7a60af0dddbf1e547ddb7448ce99e14341413ef0 Parents: 69ec4d7 7d4f062 Author: randgalt <[email protected]> Authored: Tue Jul 18 08:16:05 2017 -0500 Committer: randgalt <[email protected]> Committed: Tue Jul 18 08:16:05 2017 -0500 ---------------------------------------------------------------------- .../framework/imps/GetDataBuilderImpl.java | 5 + .../modeled/details/ModeledFrameworkImpl.java | 2 +- .../curator/x/async/TestBasicOperations.java | 10 ++ .../x/async/modeled/TestModeledFramework.java | 34 ++--- .../discovery/details/TestServiceDiscovery.java | 130 +++++++------------ 5 files changed, 78 insertions(+), 103 deletions(-) ----------------------------------------------------------------------
