hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ndimi...@apache.org
Subject hbase git commit: HBASE-13604 bin/hbase mapredcp does not include yammer-metrics jar
Date Fri, 01 May 2015 16:37:38 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1.0 402840dfe -> aee1c0aae


HBASE-13604 bin/hbase mapredcp does not include yammer-metrics jar


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/aee1c0aa
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/aee1c0aa
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/aee1c0aa

Branch: refs/heads/branch-1.0
Commit: aee1c0aae5a62ae262bb6fc628eb3e2202c48f16
Parents: 402840d
Author: Nick Dimiduk <ndimiduk@apache.org>
Authored: Thu Apr 30 15:43:59 2015 -0700
Committer: Nick Dimiduk <ndimiduk@apache.org>
Committed: Fri May 1 09:15:41 2015 -0700

----------------------------------------------------------------------
 .../org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/aee1c0aa/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
index 149752b..410e411 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
@@ -61,7 +61,6 @@ import org.apache.hadoop.mapreduce.InputFormat;
 import org.apache.hadoop.mapreduce.Job;
 import org.apache.hadoop.util.StringUtils;
 import com.google.protobuf.InvalidProtocolBufferException;
-import com.yammer.metrics.core.MetricsRegistry;
 
 /**
  * Utility for {@link TableMapper} and {@link TableReducer}
@@ -335,7 +334,6 @@ public class TableMapReduceUtil {
     TableSnapshotInputFormat.setInput(job, snapshotName, tmpRestoreDir);
     initTableMapperJob(snapshotName, scan, mapper, outputKeyClass,
         outputValueClass, job, addDependencyJars, false, TableSnapshotInputFormat.class);
-    addDependencyJars(job.getConfiguration(), MetricsRegistry.class);
     resetCacheConfig(job.getConfiguration());
   }
 
@@ -728,7 +726,8 @@ public class TableMapReduceUtil {
       io.netty.channel.Channel.class,
       com.google.protobuf.Message.class,
       com.google.common.collect.Lists.class,
-      org.apache.htrace.Trace.class);
+      org.apache.htrace.Trace.class,
+      com.yammer.metrics.core.MetricsRegistry.class);
   }
 
   /**


Mime
View raw message