Merge branch 'master' into CURATOR-96 Conflicts: curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestReaper.java
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/c6d5f21b Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/c6d5f21b Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/c6d5f21b Branch: refs/heads/CURATOR-105 Commit: c6d5f21b012e6c8407dfa5d5871c03eb1eae014b Parents: 568c699 2ef7181 Author: randgalt <randg...@apache.org> Authored: Wed Apr 2 21:22:35 2014 -0500 Committer: randgalt <randg...@apache.org> Committed: Wed Apr 2 21:22:35 2014 -0500 ---------------------------------------------------------------------- .../framework/recipes/locks/ChildReaper.java | 19 +- .../curator/framework/recipes/locks/Reaper.java | 96 +++++++-- .../framework/recipes/locks/TestReaper.java | 200 ++++++++++++------- 3 files changed, 228 insertions(+), 87 deletions(-) ----------------------------------------------------------------------