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/81e75380 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/81e75380 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/81e75380 Branch: refs/heads/ignite-3477-master Commit: 81e75380004918bb30ba686b950fd1b0a6fed5a7 Parents: 67cd719 e319697 Author: Dmitriy Govorukhin <[email protected]> Authored: Tue Apr 11 17:53:24 2017 +0300 Committer: Dmitriy Govorukhin <[email protected]> Committed: Tue Apr 11 17:53:24 2017 +0300 ---------------------------------------------------------------------- .../dht/atomic/GridDhtAtomicCache.java | 37 ++++++++++---------- .../Impl/Cache/CacheMetricsImpl.cs | 10 ------ 2 files changed, 19 insertions(+), 28 deletions(-) ----------------------------------------------------------------------
