Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-194
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2bbb519a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2bbb519a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2bbb519a Branch: refs/heads/ignite-204 Commit: 2bbb519a3cdb8ba39c5d80e3439f2959c5206358 Parents: 5d27bda d70e59f Author: avinogradov <avinogra...@gridgain.com> Authored: Tue Feb 10 18:28:30 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Tue Feb 10 18:28:30 2015 +0300 ---------------------------------------------------------------------- .../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 +- 11 files changed, 175 insertions(+), 216 deletions(-) ----------------------------------------------------------------------
