From hcatalog-commits-return-647-apmail-incubator-hcatalog-commits-archive=incubator.apache.org@incubator.apache.org Mon Jan 30 22:41:05 2012 Return-Path: X-Original-To: apmail-incubator-hcatalog-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-hcatalog-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C6D51993E for ; Mon, 30 Jan 2012 22:41:05 +0000 (UTC) Received: (qmail 84766 invoked by uid 500); 30 Jan 2012 22:41:05 -0000 Delivered-To: apmail-incubator-hcatalog-commits-archive@incubator.apache.org Received: (qmail 84720 invoked by uid 500); 30 Jan 2012 22:41:05 -0000 Mailing-List: contact hcatalog-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hcatalog-dev@incubator.apache.org Delivered-To: mailing list hcatalog-commits@incubator.apache.org Received: (qmail 84713 invoked by uid 99); 30 Jan 2012 22:41:05 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 Jan 2012 22:41:04 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 Jan 2012 22:41:02 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 26B2D23888E7; Mon, 30 Jan 2012 22:40:42 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1238056 - in /incubator/hcatalog/trunk: CHANGES.txt bin/hcat Date: Mon, 30 Jan 2012 22:40:42 -0000 To: hcatalog-commits@incubator.apache.org From: toffer@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120130224042.26B2D23888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: toffer Date: Mon Jan 30 22:40:41 2012 New Revision: 1238056 URL: http://svn.apache.org/viewvc?rev=1238056&view=rev Log: HCATALOG-234 bin/hcat need to add hbase-site.xml in classpath (daijy via toffer) Modified: incubator/hcatalog/trunk/CHANGES.txt incubator/hcatalog/trunk/bin/hcat Modified: incubator/hcatalog/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/CHANGES.txt?rev=1238056&r1=1238055&r2=1238056&view=diff ============================================================================== --- incubator/hcatalog/trunk/CHANGES.txt (original) +++ incubator/hcatalog/trunk/CHANGES.txt Mon Jan 30 22:40:41 2012 @@ -113,6 +113,8 @@ Trunk (unreleased changes) OPTIMIZATIONS BUG FIXES + HCAT-234. bin/hcat need to add hbase-site.xml in classpath (daijy via toffer) + HCAT-212. hcat trunk version should be updated (hashutosh) HCAT-230. Remove log4j compilation dependencies (enis via hashutosh) Modified: incubator/hcatalog/trunk/bin/hcat URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/bin/hcat?rev=1238056&r1=1238055&r2=1238056&view=diff ============================================================================== --- incubator/hcatalog/trunk/bin/hcat (original) +++ incubator/hcatalog/trunk/bin/hcat Mon Jan 30 22:40:41 2012 @@ -65,6 +65,10 @@ done # Put our config file in the classpath HADOOP_CLASSPATH=${HADOOP_CLASSPATH}:${HCAT_CONF_DIR} +if [ -n "$HBASE_CONF_DIR" ] && [ -d $HBASE_CONF_DIR ]; then + HADOOP_CLASSPATH=${HADOOP_CLASSPATH}:${HBASE_CONF_DIR} +fi + export HADOOP_CLASSPATH=$HADOOP_CLASSPATH export HADOOP_OPTS=$HADOOP_OPTS # run it