You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2017/06/07 21:30:06 UTC
[1/2] hbase git commit: HBASE-18184 Add hbase-hadoop2-compat jar as
MapReduce dependency
Repository: hbase
Updated Branches:
refs/heads/branch-1 e94245331 -> ba3a81666
refs/heads/master 492c3f8e2 -> 3f891a66c
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/3f891a66
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/3f891a66
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/3f891a66
Branch: refs/heads/master
Commit: 3f891a66ca6d329438b6a2b2e4a12f0c09f3e6be
Parents: 492c3f8
Author: Alex Araujo <al...@gmail.com>
Authored: Wed Jun 7 14:29:19 2017 -0500
Committer: Andrew Purtell <ap...@apache.org>
Committed: Wed Jun 7 14:25:55 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/3f891a66/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
[2/2] hbase git commit: HBASE-18184 Add hbase-hadoop2-compat jar as
MapReduce dependency
Posted by ap...@apache.org.
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/ba3a8166
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ba3a8166
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ba3a8166
Branch: refs/heads/branch-1
Commit: ba3a816663cc407ec4c4b6a9c6e9f66a8ab997d5
Parents: e942453
Author: Alex Araujo <al...@gmail.com>
Authored: Wed Jun 7 14:29:19 2017 -0500
Committer: Andrew Purtell <ap...@apache.org>
Committed: Wed Jun 7 14:26:08 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/ba3a8166/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 9ba1f07..d31ab0a 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
@@ -784,6 +784,7 @@ public class TableMapReduceUtil {
org.apache.hadoop.hbase.protobuf.generated.ClientProtos.class, // hbase-protocol
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
prefixTreeCodecClass, // hbase-prefix-tree (if null will be skipped)
// pull necessary dependencies