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/3e5e1f01 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3e5e1f01 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3e5e1f01 Branch: refs/heads/ignite-3477-master Commit: 3e5e1f01af8eb68cd69d7c1922c07fe367777ae7 Parents: 81e7538 7883668 Author: Dmitriy Govorukhin <[email protected]> Authored: Wed Apr 12 15:07:44 2017 +0300 Committer: Dmitriy Govorukhin <[email protected]> Committed: Wed Apr 12 15:07:44 2017 +0300 ---------------------------------------------------------------------- .../configuration/DataPageEvictionMode.java | 16 +++- .../MemoryPolicyConfiguration.java | 18 ++-- .../processors/cache/GridCacheContext.java | 2 - .../distributed/dht/GridDhtLocalPartition.java | 2 +- .../dht/preloader/GridDhtPreloader.java | 6 +- .../core/src/test/config/spring-multicache.xml | 16 ++++ .../IgniteCacheTopologySafeGetSelfTest.java | 2 +- .../paged/PageEvictionAbstractTest.java | 4 +- .../paged/PageEvictionMultinodeTest.java | 4 +- .../paged/PageEvictionReadThroughTest.java | 2 +- .../cpp/core-test/src/continuous_query_test.cpp | 11 ++- .../core/include/ignite/impl/module_manager.h | 26 ++++++ .../examples/include/ignite/examples/person.h | 1 - .../Cache/CacheMetricsTest.cs | 86 +++++++++----------- .../Apache.Ignite.Core/Cache/ICacheMetrics.cs | 80 ------------------ .../Impl/Cache/CacheMetricsImpl.cs | 60 -------------- 16 files changed, 125 insertions(+), 211 deletions(-) ----------------------------------------------------------------------
