Merge branch 'ignite-337' into sprint-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/10f66439 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/10f66439 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/10f66439 Branch: refs/heads/ignite-406 Commit: 10f66439c0dd071feeff716508466623005e08f9 Parents: ec5a5f2 6c82371 Author: Artem Shutak <ashu...@gridgain.com> Authored: Thu Mar 12 17:52:53 2015 +0300 Committer: Artem Shutak <ashu...@gridgain.com> Committed: Thu Mar 12 17:52:53 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/cluster/ClusterMetrics.java | 66 +++++++++++--------- .../ClusterLocalNodeMetricsMXBeanImpl.java | 5 ++ .../ignite/internal/ClusterMetricsSnapshot.java | 26 +++++++- .../apache/ignite/internal/IgniteKernal.java | 8 +-- .../mxbean/ClusterLocalNodeMetricsMXBean.java | 4 ++ .../ignite/internal/ClusterMetricsSelfTest.java | 2 + .../commands/top/VisorTopologyCommand.scala | 7 +-- .../scala/org/apache/ignite/visor/visor.scala | 8 +-- 8 files changed, 84 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/10f66439/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/10f66439/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala ----------------------------------------------------------------------
