Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ed27fbda Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ed27fbda Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ed27fbda Branch: refs/heads/ignite-1.5 Commit: ed27fbdab9d8307b4db427866ed1094526c117c8 Parents: 4ae6292 717dab2 Author: vozerov-gridgain <voze...@gridgain.com> Authored: Mon Dec 14 10:08:47 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Mon Dec 14 10:08:47 2015 +0300 ---------------------------------------------------------------------- .../TcpDiscoveryMulticastIpFinder.java | 106 +++++++++++++------ .../tcp/TcpClientDiscoverySpiMulticastTest.java | 91 +++++++++++++++- .../TcpDiscoveryIpFinderAbstractSelfTest.java | 2 +- .../TcpDiscoveryMulticastIpFinderSelfTest.java | 16 ++- 4 files changed, 174 insertions(+), 41 deletions(-) ----------------------------------------------------------------------