You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/03/04 17:21:25 UTC
[2/2] incubator-ignite git commit: Merge branch 'ignite-51' into
ignite-51-v2
Merge branch 'ignite-51' into ignite-51-v2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6ce2ec6d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6ce2ec6d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6ce2ec6d
Branch: refs/heads/ignite-51-v2
Commit: 6ce2ec6df89e513fff2369df27924befcfbfda65
Parents: 70c8131 832d1ee
Author: ivasilinets <iv...@gridgain.com>
Authored: Wed Mar 4 19:19:31 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Wed Mar 4 19:19:31 2015 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheContext.java | 4 +--
.../processors/cache/GridCacheMapEntry.java | 34 +++++++++++---------
.../processors/cache/KeyCacheObjectImpl.java | 4 +--
.../dht/atomic/GridDhtAtomicCache.java | 8 ++---
.../dht/atomic/GridNearAtomicUpdateFuture.java | 3 +-
.../local/atomic/GridLocalAtomicCache.java | 8 ++---
.../dataload/IgniteDataLoaderImpl.java | 6 ++--
.../portable/GridPortableProcessor.java | 5 ++-
.../portable/os/GridOsPortableProcessor.java | 4 +--
9 files changed, 43 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6ce2ec6d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------