Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-738
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/67978717 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/67978717 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/67978717 Branch: refs/heads/ignite-485 Commit: 679787172e7967c21231cd10d970bdd4188c0552 Parents: 87d2814 59b11b4 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Mon Apr 13 20:47:39 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Mon Apr 13 20:47:39 2015 +0300 ---------------------------------------------------------------------- .../distributed/near/GridNearCacheEntry.java | 10 ++- .../CacheQueryCloseableScanBiPredicate.java | 30 +++++++++ .../cache/query/GridCacheQueryManager.java | 8 ++- .../util/future/GridCompoundFuture.java | 9 +-- .../cache/GridCachePutAllFailoverSelfTest.java | 12 +++- ...IgniteCacheAtomicPutAllFailoverSelfTest.java | 32 ++++++++++ ...GridCachePartitionedNodeRestartSelfTest.java | 67 -------------------- .../GridCacheAbstractNodeRestartSelfTest.java | 23 ++++--- .../IgniteCacheAtomicNodeRestartTest.java | 33 ++++++++++ .../GridCachePartitionedNodeRestartTest.java | 1 + .../GridCachePartitionedTxSalvageSelfTest.java | 4 ++ .../GridCacheReplicatedNodeRestartSelfTest.java | 2 + ...acheAtomicReplicatedNodeRestartSelfTest.java | 32 ++++++++++ .../testsuites/IgniteCacheRestartTestSuite.java | 20 +++--- 14 files changed, 190 insertions(+), 93 deletions(-) ----------------------------------------------------------------------
