You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2017/02/01 15:05:05 UTC
[4/4] ignite git commit: Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e92d44f6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e92d44f6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e92d44f6
Branch: refs/heads/master
Commit: e92d44f68329797a9f7377da6ceb8885aabc90b8
Parents: b0bc6f0 4908210
Author: devozerov <vo...@gridgain.com>
Authored: Wed Feb 1 18:04:50 2017 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Wed Feb 1 18:04:50 2017 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheAdapter.java | 10 ++--
.../cache/GridCacheAffinityManager.java | 60 ++++++++------------
.../processors/cache/GridCacheContext.java | 17 ------
.../cache/GridCacheEvictionManager.java | 6 +-
.../processors/cache/GridCacheUtils.java | 20 -------
.../cache/affinity/GridCacheAffinityImpl.java | 16 +++---
.../CacheDataStructuresManager.java | 2 +-
.../distributed/dht/GridDhtCacheAdapter.java | 2 +-
.../distributed/dht/GridDhtCacheEntry.java | 2 +-
.../distributed/dht/GridDhtLocalPartition.java | 4 +-
.../dht/GridDhtPartitionTopologyImpl.java | 4 +-
.../cache/distributed/dht/GridDhtTxRemote.java | 2 +-
.../dht/GridPartitionedGetFuture.java | 2 +-
.../dht/GridPartitionedSingleGetFuture.java | 2 +-
.../dht/atomic/GridDhtAtomicCache.java | 13 +++--
.../GridNearAtomicSingleUpdateFuture.java | 2 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 4 +-
.../dht/colocated/GridDhtColocatedCache.java | 6 +-
.../colocated/GridDhtColocatedLockFuture.java | 4 +-
.../dht/preloader/GridDhtPartitionDemander.java | 8 +--
.../dht/preloader/GridDhtPartitionSupplier.java | 12 ++--
.../dht/preloader/GridDhtPreloader.java | 4 +-
.../distributed/near/GridNearAtomicCache.java | 2 +-
.../distributed/near/GridNearCacheEntry.java | 6 +-
.../distributed/near/GridNearGetFuture.java | 4 +-
.../distributed/near/GridNearLockFuture.java | 2 +-
...arOptimisticSerializableTxPrepareFuture.java | 2 +-
.../near/GridNearOptimisticTxPrepareFuture.java | 2 +-
.../GridNearPessimisticTxPrepareFuture.java | 2 +-
.../near/GridNearTransactionalCache.java | 6 +-
.../near/GridNearTxFinishFuture.java | 2 +-
.../cache/query/GridCacheQueryManager.java | 9 +--
.../continuous/CacheContinuousQueryHandler.java | 2 +-
.../continuous/CacheContinuousQueryManager.java | 2 +-
.../cache/transactions/IgniteTxAdapter.java | 4 +-
.../transactions/IgniteTxLocalAdapter.java | 4 +-
.../cache/transactions/TxDeadlockDetection.java | 2 +-
.../datastreamer/DataStreamerImpl.java | 2 +-
.../datastructures/GridCacheSetImpl.java | 2 +-
.../datastructures/GridSetQueryPredicate.java | 2 +-
.../processors/job/GridJobProcessor.java | 2 +-
.../cache/CacheAffinityCallSelfTest.java | 4 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 6 +-
.../IgniteCacheConfigVariationsFullApiTest.java | 6 +-
.../cache/IgniteCachePeekModesAbstractTest.java | 8 +--
...actQueueFailoverDataConsistencySelfTest.java | 2 +-
...niteCacheClientNodeChangingTopologyTest.java | 8 +--
.../TxOptimisticDeadlockDetectionTest.java | 2 +-
.../TxPessimisticDeadlockDetectionTest.java | 2 +-
.../processors/query/h2/IgniteH2Indexing.java | 2 +-
.../query/h2/opt/GridH2IndexBase.java | 2 +-
.../Cache/CacheAbstractTransactionalTest.cs | 8 ++-
.../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs | 9 ++-
53 files changed, 140 insertions(+), 180 deletions(-)
----------------------------------------------------------------------