Merge branch 'CURATOR-84' of https://github.com/karkum/curator into CURATOR-84
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/475a3b00 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/475a3b00 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/475a3b00 Branch: refs/heads/master Commit: 475a3b00a08dab6b5b6beb192ebe91039277a443 Parents: 0d1397a 882f541 Author: Cam McKenzie <[email protected]> Authored: Wed Aug 20 16:49:16 2014 +1000 Committer: Cam McKenzie <[email protected]> Committed: Wed Aug 20 16:49:16 2014 +1000 ---------------------------------------------------------------------- .../framework/recipes/locks/InterProcessMutex.java | 17 ++++++++++++++++- .../framework/recipes/locks/LockInternals.java | 9 +-------- .../recipes/locks/LockInternalsDriver.java | 4 +++- .../framework/recipes/locks/PredicateResults.java | 8 ++++---- .../recipes/locks/StandardLockInternalsDriver.java | 17 +++++++++++++++++ 5 files changed, 41 insertions(+), 14 deletions(-) ----------------------------------------------------------------------
