Merge branch 'ignite-sprint-4' into ignite-218
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/23929041 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/23929041 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/23929041 Branch: refs/heads/ignite-218 Commit: 239290414cec9c530c6397413d285d60489d6668 Parents: 2278c29 338e803 Author: vozerov-gridgain <[email protected]> Authored: Fri Apr 17 11:23:23 2015 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Fri Apr 17 11:23:23 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAtomicFuture.java | 7 - .../dht/atomic/GridDhtAtomicCache.java | 51 +-- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 19 -- .../dht/atomic/GridNearAtomicUpdateFuture.java | 14 - .../datastreamer/DataStreamerCacheUpdaters.java | 12 +- .../internal/GridLifecycleBeanSelfTest.java | 36 +++ .../GridCacheAtomicTimeoutSelfTest.java | 314 ------------------- .../IgniteCacheAtomicMessageRecoveryTest.java | 32 ++ .../IgniteCacheMessageRecoveryAbstractTest.java | 175 +++++++++++ .../IgniteCacheTxMessageRecoveryTest.java | 32 ++ ...eAtomicInvalidPartitionHandlingSelfTest.java | 14 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 3 +- modules/visor-console/pom.xml | 4 +- .../ignite/visor/commands/VisorConsole.scala | 20 +- 14 files changed, 313 insertions(+), 420 deletions(-) ----------------------------------------------------------------------
