Merge remote-tracking branch 'origin/ignite-sprint-3-p1' 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/6a115cb0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6a115cb0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6a115cb0 Branch: refs/heads/ignite-424 Commit: 6a115cb0974543d2982712c67b8f7fe2de84e6a7 Parents: 54a2a5f f4afde9 Author: Artem Shutak <ashu...@gridgain.com> Authored: Wed Apr 15 11:38:47 2015 +0300 Committer: Artem Shutak <ashu...@gridgain.com> Committed: Wed Apr 15 11:38:47 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/IgniteSystemProperties.java | 6 - .../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 | 70 ++++++------ .../tcp/TcpCommunicationSpiMBean.java | 9 -- .../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 + .../processors/query/h2/IgniteH2Indexing.java | 3 +- 14 files changed, 233 insertions(+), 53 deletions(-) ----------------------------------------------------------------------
