Merge branch ignite-1.5 into ignite-1.5.1
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c7dd0edd Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c7dd0edd Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c7dd0edd Branch: refs/heads/ignite-1.5.1 Commit: c7dd0edd143018fd56005ec19a06681d985a89ec Parents: cb5bd7c 6260fc1 Author: Alexey Goncharuk <alexey.goncha...@gmail.com> Authored: Mon Nov 30 20:00:07 2015 +0300 Committer: Alexey Goncharuk <alexey.goncha...@gmail.com> Committed: Mon Nov 30 20:00:07 2015 +0300 ---------------------------------------------------------------------- .../GridDeploymentPerVersionStore.java | 12 +- .../distributed/dht/GridDhtLockFuture.java | 17 ++- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 4 + .../communication/tcp/TcpCommunicationSpi.java | 12 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 2 - ...cheAbstractFullApiMultithreadedSelfTest.java | 9 +- .../IgniteCacheStoreValueAbstractTest.java | 111 +++++++++++-------- .../cache/IgniteCacheTxPreloadNoWriteTest.java | 2 +- ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 3 +- ...eRebalancingUnmarshallingFailedSelfTest.java | 13 ++- .../GridCacheLocalIsolatedNodesSelfTest.java | 6 +- .../cache/GridCacheCommandHandlerSelfTest.java | 7 +- .../tcp/IgniteCacheSslStartStopSelfTest.java | 2 +- .../twitter/IgniteTwitterStreamerTestSuite.java | 19 ++-- 14 files changed, 137 insertions(+), 82 deletions(-) ----------------------------------------------------------------------
