Author: toffer
Date: Mon Jan 30 22:42:31 2012
New Revision: 1238057
URL: http://svn.apache.org/viewvc?rev=1238057&view=rev
Log:
HCATALOG-234 bin/hcat need to add hbase-site.xml in classpath (daijy via toffer)
Modified:
incubator/hcatalog/branches/branch-0.3/CHANGES.txt
incubator/hcatalog/branches/branch-0.3/bin/hcat
Modified: incubator/hcatalog/branches/branch-0.3/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.3/CHANGES.txt?rev=1238057&r1=1238056&r2=1238057&view=diff
==============================================================================
--- incubator/hcatalog/branches/branch-0.3/CHANGES.txt (original)
+++ incubator/hcatalog/branches/branch-0.3/CHANGES.txt Mon Jan 30 22:42:31 2012
@@ -109,6 +109,8 @@ Release 0.3.0 (unreleased changes)
OPTIMIZATIONS
BUG FIXES
+ HCAT-234. bin/hcat need to add hbase-site.xml in classpath (daijy via toffer)
+
HCAT-227. NPE on HBaseInputStorageDriver when table contains a CF that's
never been successfully written to (toffer via hashutosh)
HCAT-226. HBase storage drivers should load hbase resources (hbase-site,
hbase-default) for the user (toffer via hashutosh)
Modified: incubator/hcatalog/branches/branch-0.3/bin/hcat
URL:
http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.3/bin/hcat?rev=1238057&r1=1238056&r2=1238057&view=diff
==============================================================================
--- incubator/hcatalog/branches/branch-0.3/bin/hcat (original)
+++ incubator/hcatalog/branches/branch-0.3/bin/hcat Mon Jan 30 22:42:31 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
