Merge remote-tracking branch 'remotes/origin/ignite-1020' into ignite-sprint-6
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/af829d0e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/af829d0e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/af829d0e Branch: refs/heads/ignite-sprint-7 Commit: af829d0ee0a646ac7ed96c65ddda7fc6f38212b0 Parents: 5218210 674072a Author: sboikov <sboi...@gridgain.com> Authored: Wed Jun 17 17:19:58 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Wed Jun 17 17:19:58 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAdapter.java | 4 + .../processors/cache/IgniteCacheProxy.java | 7 + .../dht/GridDhtTransactionalCacheAdapter.java | 2 +- .../cache/transactions/IgniteTxHandler.java | 2 +- .../transactions/IgniteTxLocalAdapter.java | 12 +- .../dr/IgniteDrDataStreamerCacheUpdater.java | 7 +- .../CacheStoreUsageMultinodeAbstractTest.java | 305 +++++++++++++++++++ ...eUsageMultinodeDynamicStartAbstractTest.java | 169 ++++++++++ ...oreUsageMultinodeDynamicStartAtomicTest.java | 32 ++ ...heStoreUsageMultinodeDynamicStartTxTest.java | 32 ++ ...reUsageMultinodeStaticStartAbstractTest.java | 158 ++++++++++ ...toreUsageMultinodeStaticStartAtomicTest.java | 32 ++ ...cheStoreUsageMultinodeStaticStartTxTest.java | 32 ++ .../testsuites/IgniteCacheTestSuite4.java | 4 + 14 files changed, 791 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
