You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2017/06/08 04:58:24 UTC

hbase git commit: HBASE-18184 Add hbase-hadoop2-compat jar as MapReduce dependency

Repository: hbase
Updated Branches:
  refs/heads/branch-2 84915bc68 -> c830a0f47


HBASE-18184 Add hbase-hadoop2-compat jar as MapReduce dependency

Signed-off-by: Andrew Purtell <ap...@apache.org>


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

Branch: refs/heads/branch-2
Commit: c830a0f47f58d4892dd3300032c8244d6278aecc
Parents: 84915bc
Author: Alex Araujo <al...@gmail.com>
Authored: Wed Jun 7 14:29:19 2017 -0500
Committer: Michael Stack <st...@apache.org>
Committed: Wed Jun 7 21:58:17 2017 -0700

----------------------------------------------------------------------
 .../java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java  | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/c830a0f4/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 91550e7..7c18537 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
@@ -785,6 +785,7 @@ public class TableMapReduceUtil {
       org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.class, // hbase-protocol-shaded
       org.apache.hadoop.hbase.client.Put.class,                      // hbase-client
       org.apache.hadoop.hbase.CompatibilityFactory.class,            // hbase-hadoop-compat
+      org.apache.hadoop.hbase.mapreduce.JobUtil.class,               // hbase-hadoop2-compat
       org.apache.hadoop.hbase.mapreduce.TableMapper.class,           // hbase-server
       org.apache.hadoop.hbase.metrics.impl.FastLongHistogram.class,  // hbase-metrics
       org.apache.hadoop.hbase.metrics.Snapshot.class,                // hbase-metrics-api