Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-1015
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/52025271 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/52025271 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/52025271 Branch: refs/heads/ignite-752 Commit: 52025271f3db6e764ab62d0483966159d004b42c Parents: 301f573 8e1492a Author: S.Vladykin <svlady...@gridgain.com> Authored: Wed Jul 22 09:04:55 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Wed Jul 22 09:04:55 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheMvccManager.java | 14 +++++++++ .../distributed/dht/GridDhtTxFinishFuture.java | 13 +++++++- .../GridDhtPartitionsExchangeFuture.java | 10 +++++-- .../near/GridNearOptimisticTxPrepareFuture.java | 4 ++- .../GridNearPessimisticTxPrepareFuture.java | 2 +- .../near/GridNearTxFinishFuture.java | 17 ++++++++++- .../cache/transactions/IgniteTxManager.java | 5 ++-- .../cache/GridCachePutAllFailoverSelfTest.java | 3 ++ .../GridCacheAbstractNodeRestartSelfTest.java | 9 ++++++ ...NearDisabledOptimisticTxNodeRestartTest.java | 31 ++++++++++++++++++++ .../GridCachePartitionedFailoverSelfTest.java | 5 ---- ...ePartitionedOptimisticTxNodeRestartTest.java | 12 +++++++- .../IgniteCacheFailoverTestSuite2.java | 4 +++ .../testsuites/IgniteCacheRestartTestSuite.java | 5 ++-- .../org/apache/ignite/spark/IgniteContext.scala | 14 +++++++++ 15 files changed, 130 insertions(+), 18 deletions(-) ----------------------------------------------------------------------
