Merge branch 'ignite-2926-1' into ignite-2926
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/15869f31 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/15869f31 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/15869f31 Branch: refs/heads/ignite-2523-1 Commit: 15869f313bfaea76ddd075dac97b0d675e15d446 Parents: 9ea980a 1708065 Author: vozerov-gridgain <[email protected]> Authored: Thu Apr 14 16:16:00 2016 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Thu Apr 14 16:16:00 2016 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAtomicFuture.java | 5 - .../GridAbstractNearAtomicUpdateFuture.java | 187 +++ .../dht/atomic/GridDhtAtomicCache.java | 2 +- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 5 - .../dht/atomic/GridNearAtomicUpdateFuture.java | 1358 ++++++++---------- 5 files changed, 770 insertions(+), 787 deletions(-) ----------------------------------------------------------------------
