Repository: ambari Updated Branches: refs/heads/branch-2.1 b3ef3536c -> 614893c57
Revert "AMBARI-13584: Ambari stack definition for Spark has incorrect value for SPARK_CONF_DIR (Ram Venkatesh via jluniya)" This reverts commit c6407ad88e84a51359f766bc426097d7be15b5b9. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/614893c5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/614893c5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/614893c5 Branch: refs/heads/branch-2.1 Commit: 614893c5770ded486f268350861af93ece765fe2 Parents: b3ef353 Author: Jayush Luniya <[email protected]> Authored: Thu Oct 29 08:01:35 2015 -0700 Committer: Jayush Luniya <[email protected]> Committed: Thu Oct 29 08:01:35 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/614893c5/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 85dfa38..4d30253 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_CONF_DIR:-{{spark_home}}}/conf +export SPARK_CONF_DIR=${SPARK_HOME:-{{spark_home}}}/conf # Where log files are stored.(Default:${SPARK_HOME}/logs) #export SPARK_LOG_DIR=${SPARK_HOME:-{{spark_home}}}/logs
