Merge branch 'sprint-1' into ignite-128
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/79217847 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/79217847 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/79217847 Branch: refs/heads/ignite-128 Commit: 79217847245f73e52742380a8487771768ebaa09 Parents: 0a1b1b7 d70e59f Author: vozerov-gridgain <voze...@gridgain.com> Authored: Tue Feb 10 15:28:34 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Tue Feb 10 15:28:34 2015 +0300 ---------------------------------------------------------------------- assembly/release-base.xml | 5 + .../processors/cache/GridCacheContext.java | 4 +- .../processors/cache/GridCacheMapEntry.java | 2 +- .../cache/GridCacheUpdateAtomicResult.java | 6 +- .../GridDistributedTxRemoteAdapter.java | 4 +- .../dht/atomic/GridDhtAtomicCache.java | 4 +- .../cache/transactions/IgniteTxAdapter.java | 6 +- .../transactions/IgniteTxLocalAdapter.java | 4 +- ...ridCacheVersionAbstractConflictResolver.java | 6 +- .../GridCacheVersionConflictContext.java | 166 +++++++++++++++- .../GridCacheVersionConflictContextImpl.java | 187 ------------------- .../GridCacheVersionConflictResolver.java | 2 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 38 ++-- ...tomicClientOnlyMultiNodeFullApiSelfTest.java | 6 +- ...eAtomicNearOnlyMultiNodeFullApiSelfTest.java | 19 +- 15 files changed, 210 insertions(+), 249 deletions(-) ----------------------------------------------------------------------
