Merge branch 'master' into CURATOR-421
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/2ab172a4 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/2ab172a4 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/2ab172a4 Branch: refs/heads/master Commit: 2ab172a45722efb08e85b6b4d230d9d04b4ce15b Parents: c8df9a4 1b6216e Author: randgalt <[email protected]> Authored: Fri Jul 14 12:05:00 2017 -0500 Committer: randgalt <[email protected]> Committed: Fri Jul 14 12:05:00 2017 -0500 ---------------------------------------------------------------------- .../main/java/org/apache/curator/x/async/AsyncWrappers.java | 6 ++++-- .../java/org/apache/curator/x/async/TestBasicOperations.java | 3 +-- 2 files changed, 5 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
