You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@hive.apache.org by kh...@apache.org on 2013/04/25 00:16:52 UTC

svn commit: r1471734 - /hive/branches/branch-0.11/hcatalog/webhcat/svr/src/main/bin/webhcat_config.sh

Author: khorgath
Date: Wed Apr 24 22:16:52 2013
New Revision: 1471734

URL: http://svn.apache.org/r1471734
Log:
HIVE-4419 webhcat - support ${WEBHCAT_PREFIX}/conf/ as config directory (Thejas M Nair via Sushanth Sowmyan)

Modified:
    hive/branches/branch-0.11/hcatalog/webhcat/svr/src/main/bin/webhcat_config.sh

Modified: hive/branches/branch-0.11/hcatalog/webhcat/svr/src/main/bin/webhcat_config.sh
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/hcatalog/webhcat/svr/src/main/bin/webhcat_config.sh?rev=1471734&r1=1471733&r2=1471734&view=diff
==============================================================================
--- hive/branches/branch-0.11/hcatalog/webhcat/svr/src/main/bin/webhcat_config.sh (original)
+++ hive/branches/branch-0.11/hcatalog/webhcat/svr/src/main/bin/webhcat_config.sh Wed Apr 24 22:16:52 2013
@@ -64,6 +64,8 @@ fi
 # Allow alternate conf dir location.
 if [ -e "${WEBHCAT_PREFIX}/etc/webhcat/webhcat-env.sh" ]; then
   DEFAULT_CONF_DIR=${WEBHCAT_PREFIX}/"etc/webhcat"
+elif [ -e "${WEBHCAT_PREFIX}/conf/webhcat-env.sh" ]; then
+  DEFAULT_CONF_DIR=${WEBHCAT_PREFIX}/"conf"
 else
   DEFAULT_CONF_DIR="/etc/webhcat"
 fi