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/08/09 07:45:44 UTC
[2/6] ignite git commit: Merge branch 'ignite-2545' of
https://github.com/AMashenkov/ignite into ignite-2545
Merge branch 'ignite-2545' of https://github.com/AMashenkov/ignite into ignite-2545
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ebe52afc
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ebe52afc
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ebe52afc
Branch: refs/heads/ignite-2545
Commit: ebe52afc0b2066b31537433764f4df3c7da1ea46
Parents: 789b2f3 07186d2
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Tue Aug 9 10:25:10 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Tue Aug 9 10:25:10 2016 +0300
----------------------------------------------------------------------
.../distributed/GridCacheTxRecoveryFuture.java | 6 +-
.../distributed/dht/GridDhtLockFuture.java | 6 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 6 +-
.../colocated/GridDhtColocatedLockFuture.java | 6 +-
.../distributed/near/GridNearLockFuture.java | 6 +-
...arOptimisticSerializableTxPrepareFuture.java | 6 +-
.../near/GridNearOptimisticTxPrepareFuture.java | 6 +-
.../GridNearPessimisticTxPrepareFuture.java | 6 +-
.../near/GridNearTxFinishFuture.java | 6 +-
.../util/future/GridCompoundFuture.java | 88 ++++++++++++++++----
10 files changed, 97 insertions(+), 45 deletions(-)
----------------------------------------------------------------------