Merge remote-tracking branch 'upstream/ignite-1.7.4' into ignite-1.7.4
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fc9ee6a7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fc9ee6a7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fc9ee6a7 Branch: refs/heads/ignite-4242 Commit: fc9ee6a74fe0bf413ab0643d2776a1a43e6dd5d2 Parents: bc695f8 f80bfbd Author: devozerov <[email protected]> Authored: Tue Nov 22 12:05:32 2016 +0300 Committer: devozerov <[email protected]> Committed: Tue Nov 22 12:05:32 2016 +0300 ---------------------------------------------------------------------- .../GridDhtAtomicAbstractUpdateFuture.java | 19 ++++++++----- .../dht/atomic/GridDhtAtomicCache.java | 2 +- .../atomic/GridDhtAtomicSingleUpdateFuture.java | 30 +++++++++++++------- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 10 +++++-- .../GridNearAtomicAbstractUpdateRequest.java | 5 ---- .../atomic/GridNearAtomicFullUpdateRequest.java | 5 ---- .../GridNearAtomicSingleUpdateRequest.java | 9 ------ .../dht/preloader/GridDhtPreloader.java | 18 +++++++++++- .../datastreamer/DataStreamerImpl.java | 2 +- .../ignite/internal/util/GridLogThrottle.java | 28 ++++++++++++++---- ...CacheLoadingConcurrentGridStartSelfTest.java | 6 +++- 11 files changed, 84 insertions(+), 50 deletions(-) ----------------------------------------------------------------------
