diff --git a/CHANGES.txt b/CHANGES.txt index 681be5ad588..a84cf590523 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1194,6 +1194,8 @@ Release 0.90.0 - Unreleased HBASE-3273 Set the ZK default timeout to 3 minutes HBASE-3279 [rest] Filter for gzip content encoding that wraps both input and output side. + HBASE-3223 Get VersionInfo for Running HBase Process + (Nicolas Spiegelberg via Stack) NEW FEATURES diff --git a/src/main/java/org/apache/hadoop/hbase/metrics/MetricsMBeanBase.java b/src/main/java/org/apache/hadoop/hbase/metrics/MetricsMBeanBase.java index 3d09f9532fa..1bcd80798a2 100644 --- a/src/main/java/org/apache/hadoop/hbase/metrics/MetricsMBeanBase.java +++ b/src/main/java/org/apache/hadoop/hbase/metrics/MetricsMBeanBase.java @@ -71,7 +71,7 @@ public class MetricsMBeanBase extends MetricsDynamicMBeanBase { private static MetricsRegistry copyMinusHBaseMetrics(final MetricsRegistry mr) { MetricsRegistry copy = new MetricsRegistry(); for (MetricsBase metric : mr.getMetricsList()) { - if (metric instanceof org.apache.hadoop.hbase.metrics.MetricsRate) { + if (metric instanceof MetricsRate || metric instanceof MetricsString) { continue; } copy.add(metric.getName(), metric);