You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@curator.apache.org by ra...@apache.org on 2013/06/10 17:00:50 UTC
[05/50] [abbrv] git commit: Merge branch 'master' into zk3.3.x
Merge branch 'master' into zk3.3.x
Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/ed6f52fe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/ed6f52fe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/ed6f52fe
Branch: refs/heads/zk3.3.x
Commit: ed6f52fe9e36426bf26bdb5274ac410642b2b825
Parents: 867b2eb 51515e2
Author: Jordan Zimmerman <jo...@jordanzimmerman.com>
Authored: Tue Jul 24 16:28:36 2012 -0700
Committer: Jordan Zimmerman <jo...@jordanzimmerman.com>
Committed: Tue Jul 24 16:28:36 2012 -0700
----------------------------------------------------------------------
CHANGES.txt | 2 +
.../exhibitor/ExhibitorEnsembleProvider.java | 37 +++---
.../com/netflix/curator/utils/ThreadUtils.java | 11 ++
.../framework/recipes/locks/ChildReaper.java | 41 +++---
.../curator/framework/recipes/locks/Reaper.java | 131 +++----------------
.../framework/recipes/locks/TestReaper.java | 55 +++++++-
.../discovery/server/rest/InstanceCleanup.java | 39 +++---
7 files changed, 126 insertions(+), 190 deletions(-)
----------------------------------------------------------------------