Repository: ambari Updated Branches: refs/heads/trunk 25ca5ceec -> f2ce9db94
AMBARI-13584: Ambari stack definition for Spark has incorrect value for SPARK_CONF_DIR (Ram Venkatesh via jluniya) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f2ce9db9 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f2ce9db9 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f2ce9db9 Branch: refs/heads/trunk Commit: f2ce9db943d3eedbf7c47331c21e7e2a131415b5 Parents: 25ca5ce Author: Jayush Luniya <jlun...@hortonworks.com> Authored: Wed Oct 28 13:42:00 2015 -0700 Committer: Jayush Luniya <jlun...@hortonworks.com> Committed: Wed Oct 28 13:42:00 2015 -0700 ---------------------------------------------------------------------- .../common-services/SPARK/1.2.0.2.2/configuration/spark-env.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f2ce9db9/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-env.xml b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-env.xml index 4d30253..85dfa38 100644 --- a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-env.xml +++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-env.xml @@ -70,7 +70,7 @@ # Generic options for the daemons used in the standalone deploy mode # Alternate conf dir. (Default: ${SPARK_HOME}/conf) -export SPARK_CONF_DIR=${SPARK_HOME:-{{spark_home}}}/conf +export SPARK_CONF_DIR=${SPARK_CONF_DIR:-{{spark_home}}}/conf # Where log files are stored.(Default:${SPARK_HOME}/logs) #export SPARK_LOG_DIR=${SPARK_HOME:-{{spark_home}}}/logs