Signed-off-by: Matteo Bertozzi <matteo.bertozzi@cloudera.com> Conflicts: hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
Signed-off-by: Matteo Bertozzi <matteo.bertozzi@cloudera.com> Conflicts: hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java