Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-311
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/79572adb Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/79572adb Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/79572adb Branch: refs/heads/ignite-237 Commit: 79572adb47bfd98033b39dea29d1eda8f989e288 Parents: 51acac6 f1ec719 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Fri Feb 20 13:48:40 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Fri Feb 20 13:48:40 2015 +0300 ---------------------------------------------------------------------- README.md | 181 ++++++++++++++++++- 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/GridCacheMapEntry.java | 12 +- .../processors/cache/GridCacheProjectionEx.java | 47 +++++ .../cache/GridCacheProjectionImpl.java | 11 ++ .../processors/cache/GridCacheProxyImpl.java | 8 +- .../processors/cache/GridCacheUtils.java | 2 +- .../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 +- .../GridCacheAbstractJobExecutionTest.java | 8 +- pom.xml | 2 +- readme.md | 2 - 19 files changed, 274 insertions(+), 89 deletions(-) ----------------------------------------------------------------------
