Merge remote-tracking branch 'remotes/origin/sprint-2' into gg-9809
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bedb39ce Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bedb39ce Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bedb39ce Branch: refs/heads/sprint-2 Commit: bedb39cef506c6be08db792c69d000c51089848f Parents: c59f283 eb2b178 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Wed Feb 18 13:14:47 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Wed Feb 18 13:14:47 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAdapter.java | 16 ++++++----- .../processors/cache/GridCacheMapEntry.java | 6 ++-- .../processors/cache/GridCacheProjectionEx.java | 8 +++--- .../cache/GridCacheProjectionImpl.java | 16 +++++------ .../processors/cache/GridCacheProxyImpl.java | 16 +++++------ .../processors/cache/GridCacheUtils.java | 30 ++++++++++++++------ .../dht/atomic/GridDhtAtomicCache.java | 12 ++++---- .../distributed/near/GridNearAtomicCache.java | 16 +++++------ .../cache/version/GridCacheVersion.java | 4 +-- .../cache/version/GridCacheVersionEx.java | 2 +- .../dr/GridDrDataLoadCacheUpdater.java | 4 +-- .../ignite/internal/util/IgniteUtils.java | 2 +- 12 files changed, 73 insertions(+), 59 deletions(-) ----------------------------------------------------------------------
