Merge remote-tracking branch 'remotes/origin/master' into ignite-4371
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5dbd44f2 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5dbd44f2 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5dbd44f2 Branch: refs/heads/ignite-4371 Commit: 5dbd44f2c8fc9839ca81792793104aaf0f30b7c3 Parents: 71f5bb5 b2cc951 Author: sboikov <[email protected]> Authored: Fri Dec 16 12:32:56 2016 +0300 Committer: sboikov <[email protected]> Committed: Fri Dec 16 12:32:56 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 +- .../GridCacheAtomicSequenceImpl.java | 12 +- .../processors/hadoop/HadoopClassLoader.java | 2 +- .../util/future/GridCompoundFuture.java | 56 ++++-- ...achePartitionedAtomicSequenceTxSelfTest.java | 169 +++++++++++++++++++ .../IgniteCacheDataStructuresSelfTestSuite.java | 2 + 17 files changed, 273 insertions(+), 47 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/5dbd44f2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java ----------------------------------------------------------------------
