You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/04/07 09:11:15 UTC

[2/2] ignite git commit: Merge branch 'ignite-4929' into ignite-2893

Merge branch 'ignite-4929' into ignite-2893


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/63724350
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/63724350
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/63724350

Branch: refs/heads/ignite-2893
Commit: 63724350c160bc81f4b7e521c6de7082d098b987
Parents: 355902b b69f43e
Author: sboikov <sb...@gridgain.com>
Authored: Fri Apr 7 12:10:59 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Apr 7 12:10:59 2017 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCacheUtils.java        |   9 -
 .../distributed/GridDistributedLockRequest.java |  14 +-
 .../distributed/dht/GridDhtTxPrepareFuture.java |  24 +--
 .../near/GridNearSingleGetRequest.java          |   4 +-
 .../cache/transactions/IgniteTxAdapter.java     |  11 +-
 .../cache/transactions/IgniteTxEntry.java       |  39 ++--
 .../internal/TestRecordingCommunicationSpi.java |   9 +
 .../cache/IgniteOnePhaseCommitInvokeTest.java   | 207 +++++++++++++++++++
 .../atomic/IgniteCacheAtomicProtocolTest.java   |  16 +-
 .../junits/common/GridCommonAbstractTest.java   |  22 ++
 .../testsuites/IgniteCacheTestSuite2.java       |   7 +-
 11 files changed, 284 insertions(+), 78 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/63724350/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------