ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [4/4] incubator-ignite git commit: Merge branches 'ignite-282' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-282
Date Wed, 18 Feb 2015 10:59:46 GMT
Merge branches 'ignite-282' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
into ignite-282


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

Branch: refs/heads/ignite-282
Commit: c0deec7aa53949d4a3274b8fc51c003943d2debb
Parents: fdbf0ed 81cce4c
Author: AKuznetsov <akuznetsov@gridgain.com>
Authored: Wed Feb 18 17:53:45 2015 +0700
Committer: AKuznetsov <akuznetsov@gridgain.com>
Committed: Wed Feb 18 17:53:45 2015 +0700

----------------------------------------------------------------------
 .../processors/cache/GridCacheAdapter.java      | 16 ++--
 .../processors/cache/GridCacheContext.java      |  4 +-
 .../processors/cache/GridCacheEntryEx.java      | 16 ++--
 .../processors/cache/GridCacheMapEntry.java     | 58 ++++++-------
 .../processors/cache/GridCacheProjectionEx.java |  8 +-
 .../cache/GridCacheProjectionImpl.java          | 16 ++--
 .../processors/cache/GridCacheProxyImpl.java    | 16 ++--
 .../cache/GridCacheUpdateAtomicResult.java      | 29 +++----
 .../processors/cache/GridCacheUtils.java        | 32 ++++---
 .../GridDistributedTxRemoteAdapter.java         | 19 ++---
 .../distributed/dht/GridDhtTxLocalAdapter.java  |  4 +-
 .../distributed/dht/GridDhtTxPrepareFuture.java |  2 +-
 .../dht/atomic/GridDhtAtomicCache.java          | 88 +++++++++++---------
 .../dht/atomic/GridDhtAtomicUpdateFuture.java   | 12 +--
 .../distributed/near/GridNearAtomicCache.java   | 18 ++--
 .../processors/cache/dr/GridCacheDrInfo.java    |  5 +-
 .../cache/transactions/IgniteTxEntry.java       | 56 ++++++-------
 .../transactions/IgniteTxLocalAdapter.java      | 30 +++----
 .../cache/version/GridCacheVersion.java         |  4 +-
 .../cache/version/GridCacheVersionEx.java       |  2 +-
 .../dataload/IgniteDataLoaderImpl.java          |  3 +-
 .../dr/GridDrDataLoadCacheUpdater.java          |  4 +-
 .../ignite/internal/util/IgniteUtils.java       |  2 +-
 .../processors/cache/GridCacheTestEntryEx.java  |  8 +-
 24 files changed, 236 insertions(+), 216 deletions(-)
----------------------------------------------------------------------



Mime
View raw message