[2/2] curator git commit: Merge branch 'master' into CURATOR-3.0

Merge branch 'master' into CURATOR-3.0 Conflicts: curator-test/src/main/java/org/apache/curator/test/QuorumConfigBuilder.java Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/e6ed9996 Tree:

[1/2] curator git commit: CURATOR-360 - Allow Zookeeper servers in TestingCluster to listen on network interfaces other than localhost

Repository: curator Updated Branches: refs/heads/CURATOR-3.0 60d24c2c9 -> e6ed99965 CURATOR-360 - Allow Zookeeper servers in TestingCluster to listen on network interfaces other than localhost Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit:

curator git commit: CURATOR-360 - Allow Zookeeper servers in TestingCluster to listen on network interfaces other than localhost

Repository: curator Updated Branches: refs/heads/master ee5d65463 -> 0a0a1e7d8 CURATOR-360 - Allow Zookeeper servers in TestingCluster to listen on network interfaces other than localhost Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: