You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2017/05/24 02:39:31 UTC
[14/50] [abbrv] ambari git commit: AMBARI-21074 - Storm XML File has
Invalid Characters Causing Exceptions on Server Startup (jonathanhurley)
AMBARI-21074 - Storm XML File has Invalid Characters Causing Exceptions on Server Startup (jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f952c9ee
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f952c9ee
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f952c9ee
Branch: refs/heads/branch-feature-AMBARI-12556
Commit: f952c9eecdc8cba07117ecb39265f05e6ef47341
Parents: f2bbe47
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Fri May 19 10:19:49 2017 -0400
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Fri May 19 10:19:49 2017 -0400
----------------------------------------------------------------------
.../common-services/STORM/0.9.1/configuration/storm-env.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/f952c9ee/ambari-server/src/main/resources/common-services/STORM/0.9.1/configuration/storm-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1/configuration/storm-env.xml b/ambari-server/src/main/resources/common-services/STORM/0.9.1/configuration/storm-env.xml
index cfa33e2..3d4edad 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.9.1/configuration/storm-env.xml
+++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1/configuration/storm-env.xml
@@ -128,11 +128,11 @@ export STORM_HOME={{storm_component_home_dir}}
#set storm-auto creds
# check if storm_jaas.conf in config , only enable storm_auto_creds in secure mode.
-STORM_HOME="$(dirname $(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ))"
+STORM_HOME="$(dirname $(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ))"
STORM_JAAS_CONF=$STORM_HOME/config/storm_jaas.conf
STORM_AUTOCREDS_LIB_DIR=/usr/hdp/current/storm-client/external/storm-autocreds
-if [ -f $STORM_JAAS_CONF ] && [ -d $STORM_AUTOCREDS_LIB_DIR ]; then
+if [ -f $STORM_JAAS_CONF ] && [ -d $STORM_AUTOCREDS_LIB_DIR ]; then
export STORM_EXT_CLASSPATH=$STORM_AUTOCREDS_LIB_DIR
fi