Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-265
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7997602a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7997602a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7997602a Branch: refs/heads/sprint-1-release Commit: 7997602afd63ac1670d8007738c951a84f1f02c8 Parents: cd74359 1194fdc Author: sboikov <sboi...@gridgain.com> Authored: Mon Feb 16 12:53:29 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Mon Feb 16 12:53:29 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/cluster/ClusterMetrics.java | 41 +++++++++++++++ .../ClusterLocalNodeMetricsMXBeanImpl.java | 10 ++++ .../ignite/internal/ClusterMetricsSnapshot.java | 52 ++++++++++++++++++++ .../discovery/GridDiscoveryManager.java | 2 + .../node/VisorNodeEventsCollectorTask.java | 9 ++-- .../mxbean/ClusterLocalNodeMetricsMXBean.java | 9 ++++ ...ClusterMetricsSnapshotSerializeSelfTest.java | 6 ++- 7 files changed, 125 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
