Merge branches 'ignite-312' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-312
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c15d5214 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c15d5214 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c15d5214 Branch: refs/heads/ignite-312 Commit: c15d5214589262f52ab761f36be5803d26f6800a Parents: 5a82064 45ce814 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Tue Feb 24 17:38:09 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Tue Feb 24 17:38:09 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheMapEntry.java | 562 +++++++++++-------- .../GridDistributedTxRemoteAdapter.java | 66 +-- .../dht/atomic/GridDhtAtomicCache.java | 44 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 84 +-- .../distributed/near/GridNearAtomicCache.java | 3 - .../cache/transactions/IgniteTxAdapter.java | 58 +- .../cache/transactions/IgniteTxEntry.java | 12 +- .../transactions/IgniteTxLocalAdapter.java | 40 +- .../cache/version/GridCacheVersion.java | 3 +- .../GridCacheVersionConflictContext.java | 35 +- .../cache/version/GridCacheVersionEx.java | 2 +- .../dr/GridDrDataLoadCacheUpdater.java | 6 +- .../core/src/main/resources/ignite.properties | 2 +- 13 files changed, 501 insertions(+), 416 deletions(-) ----------------------------------------------------------------------
