Merge remote-tracking branch 'remotes/origin/ignite-989' into ignite-sprint-5
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1b12bb4a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1b12bb4a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1b12bb4a Branch: refs/heads/ignite-389-ipc Commit: 1b12bb4a80a04071c77d2603956505bd66fa19ea Parents: bd3abbc 9ad3617 Author: sboikov <sboi...@gridgain.com> Authored: Thu Jun 4 09:39:12 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Jun 4 09:39:12 2015 +0300 ---------------------------------------------------------------------- .../ignite/spi/discovery/tcp/ClientImpl.java | 3 + .../ignite/spi/discovery/tcp/ServerImpl.java | 31 ----- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 56 +++++++- .../tcp/ipfinder/TcpDiscoveryIpFinder.java | 10 +- .../TcpDiscoveryMulticastIpFinder.java | 47 +++++-- .../tcp/TcpClientDiscoverySpiMulticastTest.java | 129 +++++++++++++++++++ .../IgniteSpiDiscoverySelfTestSuite.java | 1 + .../gce/TcpDiscoveryGoogleStorageIpFinder.java | 43 ++++--- 8 files changed, 244 insertions(+), 76 deletions(-) ----------------------------------------------------------------------
