You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/04/09 11:20:30 UTC

[03/12] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-694

Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-694


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5042e3b7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5042e3b7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5042e3b7

Branch: refs/heads/ignite-sprint-3
Commit: 5042e3b7bcc1498992e536a8c6f0e7b21c5bbb0a
Parents: 93948ff cbab850
Author: sboikov <sb...@gridgain.com>
Authored: Wed Apr 8 09:21:38 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Apr 8 09:21:38 2015 +0300

----------------------------------------------------------------------
 .../dht/GridClientPartitionTopology.java        |   6 +-
 .../distributed/dht/GridDhtLockFuture.java      |  10 +-
 .../dht/GridDhtPartitionTopologyImpl.java       |   6 +-
 .../distributed/dht/GridDhtTxLocalAdapter.java  |  49 +++++----
 .../distributed/dht/GridDhtTxPrepareFuture.java |   2 +-
 .../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 +-
 .../resources/META-INF/classnames.properties    |  19 ++--
 .../cache/IgniteDynamicCacheStartSelfTest.java  |  23 ++++
 ...ePartitionedBasicStoreMultiNodeSelfTest.java | 110 ++-----------------
 .../GridAbstractCommunicationSelfTest.java      |   3 +-
 .../GridTcpCommunicationSpiAbstractTest.java    |   5 +-
 ...mmunicationSpiConcurrentConnectSelfTest.java |   3 +-
 ...cpCommunicationSpiMultithreadedSelfTest.java |   3 +-
 ...dTcpCommunicationSpiRecoveryAckSelfTest.java |   3 +-
 ...GridTcpCommunicationSpiRecoverySelfTest.java |   2 +-
 .../ignite/testsuites/IgniteCacheTestSuite.java |   3 +-
 parent/pom.xml                                  |   2 +-
 pom.xml                                         |   1 +
 23 files changed, 198 insertions(+), 227 deletions(-)
----------------------------------------------------------------------