You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by nd...@apache.org on 2015/05/01 18:37:07 UTC
hbase git commit: HBASE-13604 bin/hbase mapredcp does not include
yammer-metrics jar
Repository: hbase
Updated Branches:
refs/heads/master 1d26d2640 -> 9925e6df3
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/9925e6df
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/9925e6df
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/9925e6df
Branch: refs/heads/master
Commit: 9925e6df3993817c9243993471530856e011f046
Parents: 1d26d26
Author: Nick Dimiduk <nd...@apache.org>
Authored: Thu Apr 30 15:43:59 2015 -0700
Committer: Nick Dimiduk <nd...@apache.org>
Committed: Fri May 1 09:15:16 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/9925e6df/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 c3466f3..7d793ab 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);
}
/**