Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-654
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/41963b70 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/41963b70 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/41963b70 Branch: refs/heads/ignite-gg-9950 Commit: 41963b70f02edb63080cc9b0e8f40e693fbfee59 Parents: 3821f00 c302175 Author: sboikov <sboi...@gridgain.com> Authored: Tue Mar 31 15:48:10 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Tue Mar 31 15:48:10 2015 +0300 ---------------------------------------------------------------------- DEVNOTES.txt | 6 + .../ignite/internal/GridKernalContextImpl.java | 3 +- .../org/apache/ignite/internal/IgniteEx.java | 4 +- .../apache/ignite/internal/IgniteKernal.java | 5 +- .../cache/CacheConflictResolutionManager.java | 30 ++ .../cache/CacheOsConflictResolutionManager.java | 58 ++++ .../processors/cache/CacheProjection.java | 24 -- .../processors/cache/GridCacheAdapter.java | 60 ---- .../processors/cache/GridCacheContext.java | 19 +- .../processors/cache/GridCacheProcessor.java | 20 +- .../processors/cache/GridCacheProjectionEx.java | 9 - .../cache/GridCacheProjectionImpl.java | 280 +++---------------- .../processors/cache/GridCacheProxyImpl.java | 19 -- .../processors/cache/IgniteCacheProxy.java | 2 - .../CacheDataStructuresManager.java | 4 +- .../processors/cache/dr/GridCacheDrManager.java | 5 - .../cache/dr/GridOsCacheDrManager.java | 106 +++++++ .../cache/dr/os/GridOsCacheDrManager.java | 111 -------- .../cache/query/GridCacheQueriesImpl.java | 23 +- .../transactions/IgniteTxLocalAdapter.java | 13 +- .../version/CacheVersionConflictResolver.java | 40 +++ ...ridCacheVersionAbstractConflictResolver.java | 56 ---- .../GridCacheVersionConflictResolver.java | 59 ---- .../GridProjectionForCachesSelfTest.java | 12 +- ...achePartitionedMultiNodeFullApiSelfTest.java | 2 + .../GridServiceReassignmentSelfTest.java | 5 +- .../loadtests/hashmap/GridCacheTestContext.java | 6 +- .../IgniteCacheFailoverTestSuite.java | 8 +- .../hadoop/jobtracker/HadoopJobTracker.java | 7 +- .../HadoopDefaultMapReducePlannerSelfTest.java | 3 +- parent/pom.xml | 38 +-- 31 files changed, 351 insertions(+), 686 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/41963b70/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/41963b70/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ----------------------------------------------------------------------
