curator-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From randg...@apache.org
Subject [03/29] git commit: Merge branch 'master' into CURATOR-96
Date Fri, 23 May 2014 15:07:04 GMT
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 <randgalt@apache.org>
Authored: Wed Apr 2 21:22:35 2014 -0500
Committer: randgalt <randgalt@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(-)
----------------------------------------------------------------------



Mime
View raw message