Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-171
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d9073e28 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d9073e28 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d9073e28 Branch: refs/heads/ignite-185 Commit: d9073e28cc46b9edd05729341060495c750faa18 Parents: 6237be2 1b62cf4 Author: iveselovskiy <iveselovs...@gridgain.com> Authored: Fri Feb 20 09:44:01 2015 +0300 Committer: iveselovskiy <iveselovs...@gridgain.com> Committed: Fri Feb 20 09:44:01 2015 +0300 ---------------------------------------------------------------------- examples/pom-standalone.xml | 2 +- .../java/org/apache/ignite/cache/GridCache.java | 48 ----- .../org/apache/ignite/internal/IgnitionEx.java | 4 +- .../processors/cache/GridCacheAdapter.java | 7 +- .../processors/cache/GridCacheProjectionEx.java | 47 +++++ .../cache/GridCacheProjectionImpl.java | 11 ++ .../processors/cache/GridCacheProxyImpl.java | 8 +- .../processors/cache/IgniteCacheProxy.java | 4 +- .../distributed/dht/GridDhtCacheAdapter.java | 4 +- .../distributed/near/GridNearCacheAdapter.java | 8 +- .../processors/query/GridQueryProcessor.java | 4 +- .../core/src/main/resources/ignite.properties | 3 +- .../IgniteCacheExpiryStoreLoadSelfTest.java | 6 +- pom.xml | 2 +- readme.md | 181 ++++++++++++++++++- 15 files changed, 262 insertions(+), 77 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d9073e28/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d9073e28/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ----------------------------------------------------------------------
