Merge branch 'ignite-sprint-3' into ignite-625-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0defad03 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0defad03 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0defad03 Branch: refs/heads/ignite-625-1 Commit: 0defad034989e7a54e1258da6b7b8434d31bf2f0 Parents: fb5eb42 cbab850 Author: vozerov-gridgain <voze...@gridgain.com> Authored: Wed Apr 8 10:01:54 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Wed Apr 8 10:01:54 2015 +0300 ---------------------------------------------------------------------- bin/ignite.bat | 2 +- bin/ignite.sh | 2 +- bin/include/service.sh | 8 +- config/hadoop/default-config.xml | 15 ++- .../streaming/StreamTransformerExample.java | 3 +- .../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 ++----------------- ...ridCacheFifoBatchEvictionPolicySelfTest.java | 3 +- .../GridAbstractCommunicationSelfTest.java | 3 +- .../GridTcpCommunicationSpiAbstractTest.java | 5 +- ...mmunicationSpiConcurrentConnectSelfTest.java | 3 +- ...cpCommunicationSpiMultithreadedSelfTest.java | 3 +- ...dTcpCommunicationSpiRecoveryAckSelfTest.java | 3 +- ...GridTcpCommunicationSpiRecoverySelfTest.java | 2 +- .../IgniteCacheEvictionSelfTestSuite.java | 1 + .../ignite/testsuites/IgniteCacheTestSuite.java | 3 +- parent/pom.xml | 2 +- pom.xml | 1 + 30 files changed, 218 insertions(+), 241 deletions(-) ----------------------------------------------------------------------
