Merge remote-tracking branch 'origin/sprint-2' into sprint-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d030518a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d030518a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d030518a Branch: refs/heads/ignite-281 Commit: d030518af2199e89e70d61f5ca73b332ef5d855f Parents: 94286c7 7f923e0 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Thu Feb 19 14:54:40 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Thu Feb 19 14:54:40 2015 +0700 ---------------------------------------------------------------------- .../processors/cache/CacheProjection.java | 5 ++++ .../processors/cache/GridCacheAdapter.java | 25 ++++++++++++++++++++ .../cache/GridCacheProjectionImpl.java | 5 ++++ .../processors/cache/GridCacheProxyImpl.java | 12 ++++++++++ .../dht/atomic/GridDhtAtomicCache.java | 10 ++++++++ .../distributed/near/GridNearAtomicCache.java | 10 ++++++++ .../apache/ignite/cache/spring/SpringCache.java | 2 +- 7 files changed, 68 insertions(+), 1 deletion(-) ----------------------------------------------------------------------