Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-680
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b05c14fa Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b05c14fa Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b05c14fa Branch: refs/heads/ignite-30 Commit: b05c14fa8630062863b48c893c21a2aeb542c985 Parents: 68a99f1 cbab850 Author: sboikov <sboi...@gridgain.com> Authored: Wed Apr 8 09:22:50 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Wed Apr 8 09:22:50 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 +- .../ipc/shmem/IpcSharedMemoryNativeLoader.java | 48 +++++--- .../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 | 2 + 31 files changed, 254 insertions(+), 254 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b05c14fa/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java ----------------------------------------------------------------------