Merge remote-tracking branch 'remotes/origin/ignite-709_2' into ignite-836_2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9126679c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9126679c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9126679c Branch: refs/heads/ignite-709_3 Commit: 9126679c313bb53a119faf15f6b43a9ab94cda26 Parents: 4be0438 796234f Author: sevdokimov <sevdoki...@gridgain.com> Authored: Thu May 7 17:37:01 2015 +0300 Committer: sevdokimov <sevdoki...@gridgain.com> Committed: Thu May 7 17:37:01 2015 +0300 ---------------------------------------------------------------------- .../discovery/tcp/TcpClientDiscoverySpi.java | 73 +++++--- ...pClientDiscoveryMarshallerCheckSelfTest.java | 99 +++++++++++ .../tcp/TcpClientDiscoverySelfTest.java | 178 ++++++++++++++++++- .../TcpClientDiscoverySpiConfigSelfTest.java | 39 ++++ .../IgniteSpiDiscoverySelfTestSuite.java | 2 + 5 files changed, 362 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9126679c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9126679c/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySelfTest.java ----------------------------------------------------------------------
