Merge remote-tracking branch 'remotes/origin/ignite-60' into sprint-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/78775c40 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/78775c40 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/78775c40 Branch: refs/heads/ignite-99-2 Commit: 78775c4063f6d8a6aa1bb9d8f225e89e55f25a46 Parents: 9fd191a 165698d Author: sboikov <sboi...@gridgain.com> Authored: Mon Jan 26 12:47:00 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Mon Jan 26 12:47:00 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/IgniteCache.java | 79 +++++++ .../apache/ignite/cache/CacheProjection.java | 6 + .../processors/cache/GridCacheAdapter.java | 117 +++++++++- .../cache/GridCacheProjectionImpl.java | 5 + .../processors/cache/GridCacheProxyImpl.java | 12 + .../processors/cache/IgniteCacheProxy.java | 229 +++++++++++-------- .../cache/GridCacheAbstractFullApiSelfTest.java | 14 +- .../dht/GridCacheGlobalLoadTest.java | 78 ++++++- .../GridCachePartitionedLoadCacheSelfTest.java | 25 +- 9 files changed, 450 insertions(+), 115 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78775c40/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ----------------------------------------------------------------------
