Merge branch 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-624
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/58f49139 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/58f49139 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/58f49139 Branch: refs/heads/ignite-30 Commit: 58f4913905c3dccc2fe87da2a58f73da5416955e Parents: cf1cf9d beedb17 Author: S.Vladykin <svlady...@gridgain.com> Authored: Wed Apr 8 01:25:24 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Wed Apr 8 01:25:24 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 24 +++- .../communication/tcp/TcpCommunicationSpi.java | 14 +-- .../discovery/tcp/TcpClientDiscoverySpi.java | 47 ++++---- .../spi/discovery/tcp/TcpDiscoverySpi.java | 78 ++++++------- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 8 +- .../spi/swapspace/file/FileSwapSpaceSpi.java | 4 +- ...ePartitionedBasicStoreMultiNodeSelfTest.java | 110 ++----------------- ...ridCacheFifoBatchEvictionPolicySelfTest.java | 3 +- .../GridAbstractCommunicationSelfTest.java | 3 +- .../GridTcpCommunicationSpiAbstractTest.java | 5 +- ...mmunicationSpiConcurrentConnectSelfTest.java | 3 +- ...cpCommunicationSpiMultithreadedSelfTest.java | 3 +- ...dTcpCommunicationSpiRecoveryAckSelfTest.java | 3 +- ...GridTcpCommunicationSpiRecoverySelfTest.java | 2 +- .../IgniteCacheEvictionSelfTestSuite.java | 1 + parent/pom.xml | 2 +- pom.xml | 1 + 17 files changed, 121 insertions(+), 190 deletions(-) ----------------------------------------------------------------------
