Merge remote-tracking branch 'origin/ignite-2.0' into ignite-2.0
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c219ff06 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c219ff06 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c219ff06 Branch: refs/heads/ignite-2.0 Commit: c219ff06fe4ba4171544a52713e31f1bb8c67e20 Parents: 24bb232 44e0de6 Author: devozerov <[email protected]> Authored: Thu Apr 27 15:39:57 2017 +0300 Committer: devozerov <[email protected]> Committed: Thu Apr 27 15:39:57 2017 +0300 ---------------------------------------------------------------------- .../evict/PageAbstractEvictionTracker.java | 7 ++--- .../spi/discovery/tcp/TcpDiscoverySpi.java | 8 +----- .../paged/PageEvictionAbstractTest.java | 13 ++++++++- ...LruNearEnabledPageEvictionMultinodeTest.java | 28 ++++++++++++++++++++ ...LruNearEnabledPageEvictionMultinodeTest.java | 28 ++++++++++++++++++++ .../testframework/junits/GridAbstractTest.java | 6 ++--- .../IgniteCacheEvictionSelfTestSuite.java | 4 +++ 7 files changed, 80 insertions(+), 14 deletions(-) ----------------------------------------------------------------------
