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 2015/06/12 13:54:37 UTC
[3/3] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-sprint-6' into ignite-gg-10411
Merge remote-tracking branch 'remotes/origin/ignite-sprint-6' into ignite-gg-10411
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3f20d124
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3f20d124
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3f20d124
Branch: refs/heads/ignite-gg-10411
Commit: 3f20d124d4cf3c2f9eccacf8b6f6cb83fa3c880c
Parents: f533cff 83a1986
Author: ptupitsyn <pt...@gridgain.com>
Authored: Fri Jun 12 14:54:21 2015 +0300
Committer: ptupitsyn <pt...@gridgain.com>
Committed: Fri Jun 12 14:54:21 2015 +0300
----------------------------------------------------------------------
.../distributed/GridCacheTxRecoveryRequest.java | 26 +++----
.../GridCacheTxRecoveryResponse.java | 14 ++--
.../distributed/GridDistributedBaseMessage.java | 77 +-------------------
.../distributed/GridDistributedLockRequest.java | 54 +++++++-------
.../GridDistributedLockResponse.java | 14 ++--
.../GridDistributedTxFinishRequest.java | 46 ++++++------
.../GridDistributedTxPrepareRequest.java | 62 ++++++++--------
.../GridDistributedTxPrepareResponse.java | 64 +---------------
.../GridDistributedUnlockRequest.java | 6 +-
.../distributed/dht/GridDhtLockRequest.java | 72 ++++++++++++++----
.../distributed/dht/GridDhtLockResponse.java | 18 ++---
.../distributed/dht/GridDhtTxFinishRequest.java | 38 +++++-----
.../dht/GridDhtTxPrepareRequest.java | 54 +++++++-------
.../dht/GridDhtTxPrepareResponse.java | 22 +++---
.../distributed/dht/GridDhtUnlockRequest.java | 6 +-
.../distributed/near/GridNearLockRequest.java | 58 +++++++--------
.../distributed/near/GridNearLockResponse.java | 26 +++----
.../near/GridNearTxFinishRequest.java | 26 +++----
.../near/GridNearTxPrepareRequest.java | 50 ++++++-------
.../near/GridNearTxPrepareResponse.java | 46 ++++++------
.../distributed/near/GridNearUnlockRequest.java | 2 +-
.../cache/transactions/IgniteTxHandler.java | 3 -
.../messages/GridQueryNextPageResponse.java | 1 +
23 files changed, 348 insertions(+), 437 deletions(-)
----------------------------------------------------------------------