Merge branch 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10423
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/893bef2c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/893bef2c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/893bef2c Branch: refs/heads/ignite-gg-10123 Commit: 893bef2cf381586ff3b319a3dfedfb24fe8b8cbf Parents: 3e74a6d c233aa2 Author: iveselovskiy <iveselovs...@gridgain.com> Authored: Fri Jun 12 15:53:51 2015 +0300 Committer: iveselovskiy <iveselovs...@gridgain.com> Committed: Fri Jun 12 15:53:51 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 + .../DataStreamProcessorSelfTest.java | 3 +- .../testsuites/IgniteKernalSelfTestSuite.java | 2 +- 25 files changed, 351 insertions(+), 439 deletions(-) ----------------------------------------------------------------------
