You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@curator.apache.org by ca...@apache.org on 2015/04/22 01:07:00 UTC
[03/50] curator git commit: Merge branch 'CURATOR-175.2' into
CURATOR-175
Merge branch 'CURATOR-175.2' into CURATOR-175
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/f2f03ce8
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/f2f03ce8
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/f2f03ce8
Branch: refs/heads/CURATOR-154
Commit: f2f03ce82179d74177f2595e0221ee4cbbcd86fa
Parents: ab6ad24 94fce2c
Author: randgalt <ra...@apache.org>
Authored: Mon Jan 12 15:30:07 2015 -0500
Committer: randgalt <ra...@apache.org>
Committed: Mon Jan 12 15:30:07 2015 -0500
----------------------------------------------------------------------
.../org/apache/curator/utils/ThreadUtils.java | 5 +
.../framework/imps/CuratorFrameworkImpl.java | 2 +-
.../imps/CuratorTempFrameworkImpl.java | 10 +-
.../framework/recipes/cache/TestTreeCache.java | 14 +++
.../x/discovery/ServiceDiscoveryBuilder.java | 45 +++++---
.../discovery/details/ServiceDiscoveryImpl.java | 82 ++++++++++++---
.../x/discovery/TestServiceDiscovery.java | 102 ++++++++++++-------
.../discovery/details/TestWatchedInstances.java | 94 +++++++++++++++++
8 files changed, 289 insertions(+), 65 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/f2f03ce8/curator-x-discovery/src/test/java/org/apache/curator/x/discovery/TestServiceDiscovery.java
----------------------------------------------------------------------