Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dd204dec Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dd204dec Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dd204dec Branch: refs/heads/ignite-1258 Commit: dd204deca23a6bd6d8af43dabcc7bcaca2a24145 Parents: 82ce0a0 d69e778 Author: Valentin Kulichenko <valentin.kuliche...@gmail.com> Authored: Thu Aug 20 23:57:34 2015 -0700 Committer: Valentin Kulichenko <valentin.kuliche...@gmail.com> Committed: Thu Aug 20 23:57:34 2015 -0700 ---------------------------------------------------------------------- modules/zookeeper/pom.xml | 89 +++++ .../zk/TcpDiscoveryZookeeperIpFinder.java | 350 +++++++++++++++++ .../tcp/ipfinder/zk/ZookeeperIpFinderTest.java | 390 +++++++++++++++++++ pom.xml | 1 + 4 files changed, 830 insertions(+) ----------------------------------------------------------------------
