You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vk...@apache.org on 2015/07/22 01:56:50 UTC
[2/2] incubator-ignite git commit: Merge branches 'ignite-104' and
'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into
ignite-104
Merge branches 'ignite-104' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-104
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/679f9567
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/679f9567
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/679f9567
Branch: refs/heads/ignite-104
Commit: 679f95675b169e69591ad21815888b463567452d
Parents: 4f14522 055d786
Author: Valentin Kulichenko <vk...@gridgain.com>
Authored: Tue Jul 21 16:56:38 2015 -0700
Committer: Valentin Kulichenko <vk...@gridgain.com>
Committed: Tue Jul 21 16:56:38 2015 -0700
----------------------------------------------------------------------
.../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 ++--
14 files changed, 116 insertions(+), 18 deletions(-)
----------------------------------------------------------------------