You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by pt...@apache.org on 2017/01/24 12:36:26 UTC
[5/5] ignite git commit: Merge branch 'master' into ignite-2.0
Merge branch 'master' into ignite-2.0
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/68cce9c1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/68cce9c1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/68cce9c1
Branch: refs/heads/ignite-2.0
Commit: 68cce9c1cb62f2a5f89b9e0f2078d3fe6aceb448
Parents: 0453627 28d66db
Author: Pavel Tupitsyn <pt...@apache.org>
Authored: Tue Jan 24 15:35:38 2017 +0300
Committer: Pavel Tupitsyn <pt...@apache.org>
Committed: Tue Jan 24 15:35:38 2017 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheAdapter.java | 30 ++---
.../GridDistributedCacheAdapter.java | 6 +-
.../distributed/dht/GridDhtCacheAdapter.java | 6 +-
.../distributed/dht/GridDhtLockFuture.java | 28 +++--
.../dht/GridDhtTransactionalCacheAdapter.java | 7 ++
.../distributed/dht/GridDhtTxLocalAdapter.java | 8 +-
.../dht/GridPartitionedGetFuture.java | 1 +
.../dht/GridPartitionedSingleGetFuture.java | 2 +
.../dht/atomic/GridDhtAtomicCache.java | 1 +
.../dht/colocated/GridDhtColocatedCache.java | 10 ++
.../colocated/GridDhtColocatedLockFuture.java | 10 +-
.../distributed/near/GridNearAtomicCache.java | 1 +
.../distributed/near/GridNearGetFuture.java | 1 +
.../distributed/near/GridNearGetRequest.java | 77 +++++++++----
.../distributed/near/GridNearLockFuture.java | 7 ++
.../distributed/near/GridNearLockRequest.java | 81 ++++++++-----
.../near/GridNearSingleGetRequest.java | 57 ++++++---
.../near/GridNearTransactionalCache.java | 2 +
.../cache/distributed/near/GridNearTxLocal.java | 17 ++-
.../processors/cache/local/GridLocalCache.java | 1 +
.../local/atomic/GridLocalAtomicCache.java | 1 +
.../transactions/IgniteTxLocalAdapter.java | 36 ++++--
.../cache/transactions/IgniteTxLocalEx.java | 3 +
...eCacheExpiryPolicyWithStoreAbstractTest.java | 100 +++++++++++++---
.../IgniteCacheTxExpiryPolicyWithStoreTest.java | 21 ++++
.../scala/org/apache/ignite/visor/visor.scala | 115 +++++++++++--------
.../commands/mem/VisorMemoryCommandSpec.scala | 33 ++++++
27 files changed, 481 insertions(+), 181 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/68cce9c1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------