Merge branch 'ignite-443' 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/b362fd2a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b362fd2a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b362fd2a Branch: refs/heads/ignite-gg-10002 Commit: b362fd2a036ec21b1e73b68b0750f1c9022dde6b Parents: c2f5211 bf41e9e Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Tue Mar 31 13:38:12 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Tue Mar 31 13:38:12 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/GridKernalContextImpl.java | 3 +- .../cache/CacheConflictResolutionManager.java | 30 +++++ .../cache/CacheOsConflictResolutionManager.java | 58 ++++++++++ .../processors/cache/GridCacheContext.java | 19 ++-- .../processors/cache/GridCacheProcessor.java | 9 +- .../processors/cache/dr/GridCacheDrManager.java | 5 - .../cache/dr/GridOsCacheDrManager.java | 106 ++++++++++++++++++ .../cache/dr/os/GridOsCacheDrManager.java | 111 ------------------- .../version/CacheVersionConflictResolver.java | 40 +++++++ ...ridCacheVersionAbstractConflictResolver.java | 56 ---------- .../GridCacheVersionConflictResolver.java | 59 ---------- .../loadtests/hashmap/GridCacheTestContext.java | 6 +- 12 files changed, 257 insertions(+), 245 deletions(-) ----------------------------------------------------------------------
