Merge branch 'CURATOR-3.0' of https://git-wip-us.apache.org/repos/asf/curator
into CURATOR-3.0
Conflicts:
curator-test/src/main/java/org/apache/curator/test/TestingZooKeeperMain.java
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/2d487836
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/2d487836
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/2d487836
Branch: refs/heads/CURATOR-3.0
Commit: 2d487836f54d5479027206f67cc6ccfeca7aa7b0
Parents: c4f3a50 a69f3a4
Author: randgalt <[email protected]>
Authored: Tue Sep 8 12:42:13 2015 -0500
Committer: randgalt <[email protected]>
Committed: Tue Sep 8 12:42:13 2015 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
