Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/07683c91 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/07683c91 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/07683c91 Branch: refs/heads/ignite-615-616 Commit: 07683c9120d2eda5758a9e5e88b05d46587ac2c2 Parents: b362fd2 dfe90fb Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Tue Mar 31 13:39:00 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Tue Mar 31 13:39:00 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/internal/IgniteEx.java | 4 +- .../apache/ignite/internal/IgniteKernal.java | 5 +- .../processors/cache/CacheProjection.java | 24 -- .../processors/cache/GridCacheAdapter.java | 60 ---- .../processors/cache/GridCacheProcessor.java | 11 - .../processors/cache/GridCacheProjectionEx.java | 9 - .../cache/GridCacheProjectionImpl.java | 280 +++---------------- .../processors/cache/GridCacheProxyImpl.java | 19 -- .../processors/cache/IgniteCacheProxy.java | 2 - .../CacheDataStructuresManager.java | 4 +- .../cache/query/GridCacheQueriesImpl.java | 23 +- .../GridProjectionForCachesSelfTest.java | 12 +- ...achePartitionedMultiNodeFullApiSelfTest.java | 2 + .../GridServiceReassignmentSelfTest.java | 5 +- .../hadoop/jobtracker/HadoopJobTracker.java | 7 +- .../HadoopDefaultMapReducePlannerSelfTest.java | 3 +- parent/pom.xml | 38 +-- 17 files changed, 76 insertions(+), 432 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07683c91/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ----------------------------------------------------------------------
