Merge branch 'ignite-714' into ignite-sprint-3-p1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6c1349ba Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6c1349ba Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6c1349ba Branch: refs/heads/ignite-737 Commit: 6c1349ba6db19b8607ae374f6e25b887908004e2 Parents: 60a0249 6c69496 Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Tue Apr 14 18:20:25 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Tue Apr 14 18:20:25 2015 +0300 ---------------------------------------------------------------------- .../internal/managers/GridManagerAdapter.java | 4 + .../discovery/GridDiscoveryManager.java | 14 +++ .../org/apache/ignite/spi/IgniteSpiAdapter.java | 5 + .../org/apache/ignite/spi/IgniteSpiContext.java | 6 + .../communication/tcp/TcpCommunicationSpi.java | 47 ++++++-- .../ignite/spi/discovery/DiscoverySpi.java | 7 ++ .../discovery/tcp/TcpClientDiscoverySpi.java | 12 ++ .../spi/discovery/tcp/TcpDiscoverySpi.java | 32 +++++- ...ridFailFastNodeFailureDetectionSelfTest.java | 112 +++++++++++++++++++ .../testframework/GridSpiTestContext.java | 5 + .../ignite/testsuites/IgniteBasicTestSuite.java | 1 + 11 files changed, 232 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
