svn commit: r1040273 - in /hbase/trunk: CHANGES.txt src/main/java/org/apache/hadoop/hbase/metrics/MetricsMBeanBase.java

[stack]

Author: stack
Date: Mon Nov 29 20:31:02 2010
New Revision: 1040273

URL: http://svn.apache.org/viewvc?rev=1040273&view=rev
Log:
HBASE-3223 Get VersionInfo for Running HBase Process

Modified:
    hbase/trunk/CHANGES.txt
    
hbase/trunk/src/main/java/org/apache/hadoop/hbase/metrics/MetricsMBeanBase.java

Modified: hbase/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1040273&r1=1040272&r2=1040273&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Mon Nov 29 20:31:02 2010
@@ -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

Modified: 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/metrics/MetricsMBeanBase.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/metrics/MetricsMBeanBase.java?rev=1040273&r1=1040272&r2=1040273&view=diff
==============================================================================
--- 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/metrics/MetricsMBeanBase.java 
(original)
+++ 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/metrics/MetricsMBeanBase.java 
Mon Nov 29 20:31:02 2010
@@ -71,7 +71,7 @@ public class MetricsMBeanBase extends Me
   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);