Merge branch 'ignite-3477-master-apache' 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/3a62833a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3a62833a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3a62833a Branch: refs/heads/ignite-3477-master Commit: 3a62833adb72ca3b0998b0df5c7026196dfd943d Parents: 5cded42 3e5e1f0 Author: Dmitriy Govorukhin <[email protected]> Authored: Wed Apr 12 15:08:50 2017 +0300 Committer: Dmitriy Govorukhin <[email protected]> Committed: Wed Apr 12 15:08:50 2017 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheContext.java | 2 - .../distributed/dht/GridDhtLocalPartition.java | 2 +- .../dht/atomic/GridDhtAtomicCache.java | 37 +++++---- .../IgniteCacheTopologySafeGetSelfTest.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 | 70 ---------------- 10 files changed, 92 insertions(+), 225 deletions(-) ----------------------------------------------------------------------
