Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id D929B200B50 for ; Fri, 29 Jul 2016 22:43:26 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id D8084160A6E; Fri, 29 Jul 2016 20:43:26 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 2A5A1160A79 for ; Fri, 29 Jul 2016 22:43:26 +0200 (CEST) Received: (qmail 87573 invoked by uid 500); 29 Jul 2016 20:43:25 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 87564 invoked by uid 99); 29 Jul 2016 20:43:25 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 Jul 2016 20:43:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 317B6E78B5; Fri, 29 Jul 2016 20:43:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: stack@apache.org To: commits@hbase.apache.org Message-Id: <23631890ab8b4b6e96f3cc074f8634f2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: HBASE-16306 Add specific imports to avoid namespace clash in defaultSource.scala (Sai Teja Ranuva) Date: Fri, 29 Jul 2016 20:43:25 +0000 (UTC) archived-at: Fri, 29 Jul 2016 20:43:27 -0000 Repository: hbase Updated Branches: refs/heads/master fe4438361 -> ff7d0082b HBASE-16306 Add specific imports to avoid namespace clash in defaultSource.scala (Sai Teja Ranuva) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/ff7d0082 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ff7d0082 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ff7d0082 Branch: refs/heads/master Commit: ff7d0082b85f8da501ba5c3834ce37c9464ab41f Parents: fe44383 Author: stack Authored: Fri Jul 29 13:43:16 2016 -0700 Committer: stack Committed: Fri Jul 29 13:43:16 2016 -0700 ---------------------------------------------------------------------- .../scala/org/apache/hadoop/hbase/spark/DefaultSource.scala | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/ff7d0082/hbase-spark/src/main/scala/org/apache/hadoop/hbase/spark/DefaultSource.scala ---------------------------------------------------------------------- diff --git a/hbase-spark/src/main/scala/org/apache/hadoop/hbase/spark/DefaultSource.scala b/hbase-spark/src/main/scala/org/apache/hadoop/hbase/spark/DefaultSource.scala index 0c29f50..1a3c370 100644 --- a/hbase-spark/src/main/scala/org/apache/hadoop/hbase/spark/DefaultSource.scala +++ b/hbase-spark/src/main/scala/org/apache/hadoop/hbase/spark/DefaultSource.scala @@ -26,7 +26,11 @@ import org.apache.hadoop.hbase.mapred.TableOutputFormat import org.apache.hadoop.hbase.spark.datasources._ import org.apache.hadoop.hbase.types._ import org.apache.hadoop.hbase.util.{Bytes, PositionedByteRange, SimplePositionedMutableByteRange} -import org.apache.hadoop.hbase._ +import org.apache.hadoop.hbase.HBaseConfiguration +import org.apache.hadoop.hbase.HTableDescriptor +import org.apache.hadoop.hbase.HColumnDescriptor +import org.apache.hadoop.hbase.TableName +import org.apache.hadoop.hbase.CellUtil import org.apache.hadoop.mapred.JobConf import org.apache.spark.Logging import org.apache.spark.rdd.RDD