ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [02/27] incubator-ignite git commit: Merge branch 'sprint-2' into ignite-217
Date Fri, 27 Feb 2015 13:15:31 GMT
Merge branch 'sprint-2' into ignite-217


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

Branch: refs/heads/ignite-239
Commit: 2b1a74fb16cff211dc7690d43b19ac6cc3978408
Parents: 8c526b9 ee38639
Author: Artem Shutak <ashutak@gridgain.com>
Authored: Wed Feb 18 20:35:59 2015 +0300
Committer: Artem Shutak <ashutak@gridgain.com>
Committed: Wed Feb 18 20:35:59 2015 +0300

----------------------------------------------------------------------
 .../apache/ignite/internal/GridComponent.java   |   4 +-
 .../ignite/internal/GridPluginComponent.java    |   2 +-
 .../internal/managers/GridManagerAdapter.java   |   2 +-
 .../discovery/GridDiscoveryManager.java         |   4 +-
 .../processors/GridProcessorAdapter.java        |   2 +-
 .../processors/cache/GridCacheAdapter.java      |  36 +++-
 .../processors/cache/GridCacheContext.java      |  14 +-
 .../processors/cache/GridCacheEntryEx.java      |  16 +-
 .../processors/cache/GridCacheMapEntry.java     |  52 +++---
 .../processors/cache/GridCacheSwapManager.java  |  84 +++++-----
 .../cache/GridCacheUpdateAtomicResult.java      |  29 ++--
 .../processors/cache/GridCacheUtils.java        |   2 +-
 .../GridDistributedTxRemoteAdapter.java         |  21 ++-
 .../distributed/dht/GridDhtCacheAdapter.java    |   9 +-
 .../distributed/dht/GridDhtCacheEntry.java      | 112 ++++++++-----
 .../distributed/dht/GridDhtTxLocalAdapter.java  |   5 +-
 .../distributed/dht/GridDhtTxPrepareFuture.java |  13 +-
 .../dht/atomic/GridDhtAtomicCache.java          | 126 +++++++-------
 .../dht/atomic/GridDhtAtomicUpdateFuture.java   |  12 +-
 .../dht/atomic/GridDhtAtomicUpdateRequest.java  | 100 +++++------
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |   4 +-
 .../dht/atomic/GridNearAtomicUpdateRequest.java | 128 +++++++-------
 .../distributed/near/GridNearAtomicCache.java   |   2 +-
 .../near/GridNearTxPrepareFuture.java           |   5 +-
 .../processors/cache/dr/GridCacheDrInfo.java    |   5 +-
 .../cache/transactions/IgniteTxAdapter.java     |   5 +-
 .../cache/transactions/IgniteTxEntry.java       |  63 +++----
 .../transactions/IgniteTxLocalAdapter.java      |  65 +++-----
 .../continuous/GridContinuousProcessor.java     |   2 +-
 .../dataload/IgniteDataLoaderImpl.java          |   3 +-
 .../plugin/IgnitePluginProcessor.java           |   4 +-
 .../apache/ignite/plugin/PluginProvider.java    |   3 +-
 .../spi/discovery/DiscoverySpiDataExchange.java |   3 +-
 .../discovery/tcp/TcpClientDiscoverySpi.java    |   4 +-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |   4 +-
 .../discovery/tcp/TcpDiscoverySpiAdapter.java   |   2 +-
 .../IgniteCacheExpiryStoreLoadSelfTest.java     | 166 +++++++++++++++++++
 .../cache/GridCacheQueryIndexSelfTest.java      |   4 +-
 .../processors/cache/GridCacheTestEntryEx.java  |   8 +-
 .../IgniteCacheExpiryPolicyTestSuite.java       |   3 +
 .../discovery/AbstractDiscoverySelfTest.java    |   4 +-
 .../tcp/TcpDiscoverySpiStartStopSelfTest.java   |   2 +-
 .../junits/spi/GridSpiAbstractTest.java         |   2 +-
 .../cache/GridCacheQueryLoadSelfTest.java       |  30 ++--
 44 files changed, 684 insertions(+), 482 deletions(-)
----------------------------------------------------------------------



Mime
View raw message