Merge remote-tracking branch 'remotes/origin/ignite-746-1' into ignite-sprint-4
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/338e803f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/338e803f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/338e803f Branch: refs/heads/ignite-648 Commit: 338e803f01fcfb16decf8c7406f9329e9b7f8737 Parents: 655514b 197885d Author: sboikov <sboi...@gridgain.com> Authored: Fri Apr 17 11:12:11 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri Apr 17 11:12:11 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAtomicFuture.java | 7 - .../dht/atomic/GridDhtAtomicCache.java | 51 +-- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 19 -- .../dht/atomic/GridNearAtomicUpdateFuture.java | 14 - .../internal/GridLifecycleBeanSelfTest.java | 36 +++ .../GridCacheAtomicTimeoutSelfTest.java | 314 ------------------- .../IgniteCacheAtomicMessageRecoveryTest.java | 32 ++ .../IgniteCacheMessageRecoveryAbstractTest.java | 175 +++++++++++ .../IgniteCacheTxMessageRecoveryTest.java | 32 ++ ...eAtomicInvalidPartitionHandlingSelfTest.java | 14 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 3 +- 11 files changed, 290 insertions(+), 407 deletions(-) ----------------------------------------------------------------------
