Merge remote-tracking branch 'origin/ignite-sprint-6' 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/4cc376be Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4cc376be Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4cc376be Branch: refs/heads/ignite-980 Commit: 4cc376bedd63aee6cb5de434c435b3384431ed63 Parents: fa6615a fffc2ec Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Thu Jun 18 09:45:26 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Thu Jun 18 09:45:26 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAdapter.java | 4 + .../processors/cache/IgniteCacheProxy.java | 7 + .../dht/GridDhtPartitionTopologyImpl.java | 4 +- .../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 ++ .../IgniteCacheP2pUnmarshallingTxErrorTest.java | 19 +- .../junits/common/GridCommonAbstractTest.java | 8 +- .../testsuites/IgniteCacheTestSuite4.java | 4 + 17 files changed, 810 insertions(+), 19 deletions(-) ----------------------------------------------------------------------
