ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [2/2] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3
Date Tue, 31 Mar 2015 12:46:02 GMT
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/721058ae
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/721058ae
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/721058ae

Branch: refs/heads/ignite-gg-9950
Commit: 721058ae86798bc3745c663755ead5a7339966c0
Parents: fc2c945 c302175
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Tue Mar 31 15:45:34 2015 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Tue Mar 31 15:45:34 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 -------------------
 .../transactions/IgniteTxLocalAdapter.java      |  13 ++-
 .../version/CacheVersionConflictResolver.java   |  40 +++++++
 ...ridCacheVersionAbstractConflictResolver.java |  56 ----------
 .../GridCacheVersionConflictResolver.java       |  59 ----------
 .../loadtests/hashmap/GridCacheTestContext.java |   6 +-
 .../IgniteCacheFailoverTestSuite.java           |   8 +-
 14 files changed, 269 insertions(+), 254 deletions(-)
----------------------------------------------------------------------



Mime
View raw message