Merge branch 'CURATOR-3.0' of https://git-wip-us.apache.org/repos/asf/curator into CURATOR-3.0
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/5c34cb10 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/5c34cb10 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/5c34cb10 Branch: refs/heads/CURATOR-3.0 Commit: 5c34cb10bd3e18bfde8b6f71d490bc4325f9d726 Parents: 0ae2950 2d0d2b1 Author: randgalt <randg...@apache.org> Authored: Wed Jan 6 12:52:50 2016 -0800 Committer: randgalt <randg...@apache.org> Committed: Wed Jan 6 12:52:50 2016 -0800 ---------------------------------------------------------------------- .../main/java/org/apache/curator/test/TestingZooKeeperMain.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
