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 Commit: 6ce2ec6df89e513fff2369df27924befcfbfda65 Parents: 70c8131 832d1ee Author: ivasilinets <ivasilin...@gridgain.com> Authored: Wed Mar 4 19:19:31 2015 +0300 Committer: ivasilinets <ivasilin...@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 ----------------------------------------------------------------------
