You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/06/08 12:19:47 UTC
[06/11] ignite git commit: Merge remote-tracking branch
'upstream/gridgain-7.6.1' into gridgain-7.6.1
Merge remote-tracking branch 'upstream/gridgain-7.6.1' into gridgain-7.6.1
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a60bb3b6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a60bb3b6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a60bb3b6
Branch: refs/heads/master
Commit: a60bb3b658bb6d4688e07e0e4d07aff6a976c6a3
Parents: 33b0eb2 4e82af8
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed Jun 8 14:54:37 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Jun 8 14:54:37 2016 +0300
----------------------------------------------------------------------
.../apache/ignite/IgniteSystemProperties.java | 3 +
.../GridCachePartitionExchangeManager.java | 43 ++++++-
.../distributed/GridCacheTxRecoveryFuture.java | 58 ++++++---
.../GridDhtPartitionsExchangeFuture.java | 42 +++++-
.../cache/transactions/IgniteTxManager.java | 9 +-
.../IgniteCacheMessageWriteTimeoutTest.java | 129 +++++++++++++++++++
.../ignite/testsuites/IgniteCacheTestSuite.java | 2 +
7 files changed, 253 insertions(+), 33 deletions(-)
----------------------------------------------------------------------