ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [03/11] ignite git commit: Merge branch 'master' into ignite-2264
Date Sun, 03 Jan 2016 20:17:19 GMT
Merge branch 'master' into ignite-2264


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

Branch: refs/heads/ignite-2264
Commit: 521ca89f268bda427e57c20c9ef32c94bb5764a0
Parents: 65f565c cd5cd2e
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Sun Jan 3 22:59:39 2016 +0400
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Sun Jan 3 22:59:39 2016 +0400

----------------------------------------------------------------------
 .../GridDistributedTxRemoteAdapter.java         | 12 ++-
 .../dht/CacheDistributedGetFutureAdapter.java   | 10 ++-
 .../distributed/dht/GridDhtTxFinishFuture.java  | 15 +++-
 .../cache/distributed/dht/GridDhtTxLocal.java   | 31 ++++---
 .../distributed/dht/GridDhtTxPrepareFuture.java | 48 ++++++----
 .../dht/GridPartitionedGetFuture.java           |  2 +-
 .../distributed/near/GridNearGetFuture.java     |  2 +-
 ...arOptimisticSerializableTxPrepareFuture.java | 94 +++++++++++---------
 .../near/GridNearOptimisticTxPrepareFuture.java | 63 +++++++------
 .../GridNearPessimisticTxPrepareFuture.java     |  6 +-
 .../cache/distributed/near/GridNearTxLocal.java | 69 ++++++++------
 .../near/GridNearTxPrepareFutureAdapter.java    |  8 +-
 .../cache/local/GridLocalLockFuture.java        | 19 ++--
 .../cache/transactions/IgniteTxAdapter.java     | 24 ++---
 .../cache/transactions/IgniteTxEntry.java       | 12 ++-
 .../transactions/IgniteTxLocalAdapter.java      | 38 ++++----
 .../internal/GridUpdateNotifierSelfTest.java    |  2 +-
 17 files changed, 284 insertions(+), 171 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/521ca89f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------


Mime
View raw message