AMBARI-13648. Fix incorrect SPARK_CONF_DIR in Ambari stack definition (Saisai Shao via smohanty)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/745036eb Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/745036eb Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/745036eb Branch: refs/heads/branch-dev-patch-upgrade Commit: 745036ebb5a6729c3e34a9c70a4bffd8ef713e4c Parents: 2cd1294 Author: Sumit Mohanty <[email protected]> Authored: Mon Nov 2 03:34:18 2015 -0800 Committer: Sumit Mohanty <[email protected]> Committed: Mon Nov 2 03:37:41 2015 -0800 ---------------------------------------------------------------------- .../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/745036eb/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..8e871eb 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
