Merge branch 'master' into CURATOR-419
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/666b1752 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/666b1752 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/666b1752 Branch: refs/heads/CURATOR-419 Commit: 666b175228d7e642d1b0bbf049119a628501900e Parents: 7401345 c6f7aeb Author: randgalt <[email protected]> Authored: Sun Jul 16 14:46:26 2017 -0500 Committer: randgalt <[email protected]> Committed: Sun Jul 16 14:46:26 2017 -0500 ---------------------------------------------------------------------- .../org/apache/curator/framework/imps/GetDataBuilderImpl.java | 5 +++++ .../java/org/apache/curator/x/async/TestBasicOperations.java | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
