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/ebb5d4ad Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ebb5d4ad Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ebb5d4ad Branch: refs/heads/ignite-1258 Commit: ebb5d4ad963371749a4ca20cf4b994af6769d659 Parents: 39509b5 dd204de Author: vozerov-gridgain <voze...@gridgain.com> Authored: Fri Aug 21 11:05:25 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Fri Aug 21 11:05:25 2015 +0300 ---------------------------------------------------------------------- .../TcpDiscoveryMulticastIpFinder.java | 38 ++ modules/zookeeper/pom.xml | 89 +++++ .../zk/TcpDiscoveryZookeeperIpFinder.java | 350 +++++++++++++++++ .../tcp/ipfinder/zk/ZookeeperIpFinderTest.java | 390 +++++++++++++++++++ pom.xml | 1 + 5 files changed, 868 insertions(+) ----------------------------------------------------------------------
