ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [5/6] ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-2412
Date Fri, 16 Dec 2016 08:49:28 GMT
Merge remote-tracking branch 'remotes/origin/master' into ignite-2412


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

Branch: refs/heads/ignite-2412
Commit: 9d076bf3f19815d0475182d13de23794470c38ab
Parents: 0f0e7a4 b2cc951
Author: sboikov <sboikov@gridgain.com>
Authored: Fri Dec 16 11:34:37 2016 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Fri Dec 16 11:34:37 2016 +0300

----------------------------------------------------------------------
 examples/pom-standalone.xml                     |  6 +++
 modules/cassandra/pom.xml                       | 24 ++++-----
 .../distributed/GridCacheTxRecoveryFuture.java  |  4 +-
 .../cache/distributed/dht/GridDhtGetFuture.java |  2 +-
 .../distributed/dht/GridDhtLockFuture.java      |  4 +-
 .../distributed/dht/GridDhtTxPrepareFuture.java |  4 +-
 .../colocated/GridDhtColocatedLockFuture.java   |  4 +-
 .../distributed/near/GridNearLockFuture.java    |  4 +-
 ...arOptimisticSerializableTxPrepareFuture.java |  4 +-
 .../near/GridNearOptimisticTxPrepareFuture.java | 15 ++++--
 .../GridNearPessimisticTxPrepareFuture.java     |  4 +-
 .../near/GridNearTxFinishFuture.java            |  4 +-
 .../util/future/GridCompoundFuture.java         | 56 +++++++++++++-------
 13 files changed, 91 insertions(+), 44 deletions(-)
----------------------------------------------------------------------



Mime
View raw message