Merge branches 'ignite-1023' and 'ignite-sprint-7' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-1023
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a57fba69 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a57fba69 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a57fba69 Branch: refs/heads/ignite-1023 Commit: a57fba69e69f55ba179dcfe16f23616874b70b20 Parents: 08cba6b b29ff1c Author: AKuznetsov <akuznet...@gridgain.com> Authored: Thu Jun 25 10:25:20 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Thu Jun 25 10:25:20 2015 +0700 ---------------------------------------------------------------------- .../processors/cache/GridCacheContext.java | 2 +- .../distributed/dht/GridDhtLockFuture.java | 2 +- .../GridDhtPartitionsExchangeFuture.java | 46 +- .../CacheReadThroughAtomicRestartSelfTest.java | 32 ++ ...heReadThroughLocalAtomicRestartSelfTest.java | 32 ++ .../CacheReadThroughLocalRestartSelfTest.java | 32 ++ ...dThroughReplicatedAtomicRestartSelfTest.java | 32 ++ ...cheReadThroughReplicatedRestartSelfTest.java | 32 ++ .../cache/CacheReadThroughRestartSelfTest.java | 133 ++++++ .../cache/GridCacheAbstractSelfTest.java | 2 +- ...eDynamicCacheStartNoExchangeTimeoutTest.java | 466 +++++++++++++++++++ .../cache/IgniteDynamicCacheStartSelfTest.java | 37 ++ .../distributed/IgniteCache150ClientsTest.java | 189 ++++++++ ...teCacheClientNodePartitionsExchangeTest.java | 1 + .../IgniteCacheTxStoreSessionTest.java | 4 + .../testsuites/IgniteCacheTestSuite4.java | 8 + .../testsuites/IgniteClientTestSuite.java | 38 ++ 17 files changed, 1077 insertions(+), 11 deletions(-) ----------------------------------------------------------------------
