Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-211
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c66fcd54 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c66fcd54 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c66fcd54 Branch: refs/heads/ignite-211 Commit: c66fcd54b13beb3f9af511a2d53149268beba480 Parents: a1809fb d70e59f Author: avinogradov <avinogra...@gridgain.com> Authored: Tue Feb 10 18:22:44 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Tue Feb 10 18:22:44 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 +- 12 files changed, 180 insertions(+), 216 deletions(-) ----------------------------------------------------------------------
