Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-59
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6accb8c6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6accb8c6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6accb8c6 Branch: refs/heads/ignite-59 Commit: 6accb8c653ee8698aa880dc78bfe98634e032fce Parents: b9c6f3b 8970463 Author: Sergey Evdokimov <sergey.evdoki...@jetbrains.com> Authored: Sun Jan 25 14:35:54 2015 +0300 Committer: Sergey Evdokimov <sergey.evdoki...@jetbrains.com> Committed: Sun Jan 25 14:35:54 2015 +0300 ---------------------------------------------------------------------- NOTICE.txt | 76 +++++++ examples/pom-standalone.xml | 32 +-- .../apache/ignite/IgniteCachingProvider.java | 3 +- .../processors/cache/CacheEntryImpl.java | 8 +- .../processors/cache/GridCacheAdapter.java | 32 +++ .../processors/cache/GridCacheContext.java | 13 ++ .../processors/cache/GridCacheGateway.java | 2 + .../processors/cache/IgniteCacheProxy.java | 19 +- .../cache/datastructures/GridCacheSetImpl.java | 174 ++------------ .../cache/query/GridCacheQueryAdapter.java | 14 +- .../query/GridCacheQueryFutureAdapter.java | 7 +- .../cache/query/GridCacheQueryManager.java | 4 +- .../cache/CacheIteratorConverter.java | 39 ++++ .../cache/CacheWeakQueryIteratorsHolder.java | 228 +++++++++++++++++++ .../cache/GridCacheAbstractFullApiSelfTest.java | 178 +++++++++++++++ 15 files changed, 620 insertions(+), 209 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6accb8c6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6accb8c6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java ----------------------------------------------------------------------
