Merge branch 'ignite-3477-master' of https://github.com/gridgain/apache-ignite into ignite-3477-master
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/06cee57e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/06cee57e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/06cee57e Branch: refs/heads/ignite-3477-master Commit: 06cee57e623a1c70c9bfc23547cbc66f2b62eac9 Parents: b9867eb face0c7 Author: Alexey Goncharuk <[email protected]> Authored: Tue Apr 11 19:53:59 2017 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Tue Apr 11 19:53:59 2017 +0300 ---------------------------------------------------------------------- .../configuration/DataPageEvictionMode.java | 16 ++++++++++++++-- .../configuration/MemoryPolicyConfiguration.java | 18 ++++++++++++------ .../core/src/test/config/spring-multicache.xml | 16 ++++++++++++++++ .../eviction/paged/PageEvictionAbstractTest.java | 4 ++-- .../eviction/paged/PageEvictionMultinodeTest.java | 4 ++-- .../paged/PageEvictionReadThroughTest.java | 2 +- 6 files changed, 47 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
