commit 2fdd7068a7d7db73b2fe5635babbbead3e1f9460
author Nathan Marz <nathan@nathanmarz.com> Fri Feb 01 14:42:16 2013 -0800
committer Nathan Marz <nathan@nathanmarz.com> Fri Feb 01 14:42:16 2013 -0800
tree 8e4a13188ce573cf723c9af8edb923a695574293
parent b1a1851611f9c0cfdcc31cb90aef531e7b0ac5e9
parent 4859f0d0e994197f259f60b9033e272b28a3cdde

Merge branch 'master' into 0.9.0

src/jvm/backtype/storm/metric/api/CountMetric.java

diff --git a/src/jvm/backtype/storm/metric/api/CountMetric.java b/src/jvm/backtype/storm/metric/api/CountMetric.java
index edf3a59..7a8f829 100644
--- a/src/jvm/backtype/storm/metric/api/CountMetric.java
+++ b/src/jvm/backtype/storm/metric/api/CountMetric.java
@@ -2,7 +2,7 @@
 
 import backtype.storm.metric.api.IMetric;
 
-public class CountMetric implements IMetric, java.io.Serializable {
+public class CountMetric implements IMetric {
     long _value = 0;
 
     public CountMetric() {

src/jvm/backtype/storm/metric/api/MultiCountMetric.java

diff --git a/src/jvm/backtype/storm/metric/api/MultiCountMetric.java b/src/jvm/backtype/storm/metric/api/MultiCountMetric.java
index 2649bee..02473ca 100644
--- a/src/jvm/backtype/storm/metric/api/MultiCountMetric.java
+++ b/src/jvm/backtype/storm/metric/api/MultiCountMetric.java
@@ -4,7 +4,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-public class MultiCountMetric implements IMetric, java.io.Serializable {
+public class MultiCountMetric implements IMetric {
     Map<String, CountMetric> _value = new HashMap();
 
     public MultiCountMetric() {