Merge remote-tracking branch 'origin/ignite-3477-master' into ignite-3477-master-apache
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fef28344 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fef28344 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fef28344 Branch: refs/heads/ignite-3477-master Commit: fef2834495cc2c7245dfb0282f8411f7651b1887 Parents: 4ae084d d69a594 Author: Dmitriy Govorukhin <[email protected]> Authored: Tue Apr 11 16:45:37 2017 +0300 Committer: Dmitriy Govorukhin <[email protected]> Committed: Tue Apr 11 16:45:37 2017 +0300 ---------------------------------------------------------------------- .../cache/distributed/dht/GridDhtLocalPartition.java | 14 ++++++++------ .../distributed/dht/preloader/GridDhtPreloader.java | 4 ++-- .../eviction/paged/PageEvictionWithRebalanceTest.java | 6 +++--- 3 files changed, 13 insertions(+), 11 deletions(-) ----------------------------------------------------------------------
