Repository: ambari Updated Branches: refs/heads/branch-2.1.2 51ac4130a -> 856f675e6
Revert "AMBARI-13584: Ambari stack definition for Spark has incorrect value for SPARK_CONF_DIR (Ram Venkatesh via jluniya)" This reverts commit 4c1787a6bd577c0ac8d88e8f64bb94deb37e60ce. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/856f675e Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/856f675e Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/856f675e Branch: refs/heads/branch-2.1.2 Commit: 856f675e6747dbcd955a8fabc6179780306937a5 Parents: 51ac413 Author: Jayush Luniya <[email protected]> Authored: Thu Oct 29 08:00:32 2015 -0700 Committer: Jayush Luniya <[email protected]> Committed: Thu Oct 29 08:00:32 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/856f675e/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 c322172..96341d8 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 @@ -68,7 +68,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
