Merge remote-tracking branch 'remotes/origin/master' into ignite-5578
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/567392de Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/567392de Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/567392de Branch: refs/heads/ignite-5578 Commit: 567392de0d1c7ca9a2a45756d54a76e4c07ddd1e Parents: 1e154fb 5704e39 Author: sboikov <sboi...@gridgain.com> Authored: Thu Jul 27 12:52:16 2017 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Jul 27 12:52:16 2017 +0300 ---------------------------------------------------------------------- .../dht/atomic/DhtAtomicUpdateResult.java | 131 +++++++ .../dht/atomic/GridDhtAtomicCache.java | 380 ++++++++----------- .../GridNearAtomicAbstractUpdateFuture.java | 2 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 4 +- 4 files changed, 282 insertions(+), 235 deletions(-) ----------------------------------------------------------------------
