Repository: spark Updated Branches: refs/heads/branch-1.2 5845a6236 -> 964f54478
SPARK-4924 addendum. Minor assembly directory fix in load-spark-env-sh Set the current dir path $FWDIR and same at $ASSEMBLY_DIR1, $ASSEMBLY_DIR2 otherwise $SPARK_HOME cannot be visible from spark-env.sh -- no SPARK_HOME variable is assigned there. I am using the Spark-1.3.0 source code package and I come across with this when trying to start the master: sbin/start-master.sh Author: raschild <rasch...@users.noreply.github.com> Closes #5261 from raschild/patch-1 and squashes the following commits: b9babcd [raschild] Update load-spark-env.sh Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/964f5447 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/964f5447 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/964f5447 Branch: refs/heads/branch-1.2 Commit: 964f5447898ab53d5db0b9d7e63cced162dbac08 Parents: 5845a62 Author: raschild <rasch...@users.noreply.github.com> Authored: Thu Apr 9 07:04:18 2015 -0400 Committer: Sean Owen <so...@cloudera.com> Committed: Wed Apr 15 12:28:58 2015 +0100 ---------------------------------------------------------------------- bin/load-spark-env.sh | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/964f5447/bin/load-spark-env.sh ---------------------------------------------------------------------- diff --git a/bin/load-spark-env.sh b/bin/load-spark-env.sh index 356b3d4..f33a15d 100644 --- a/bin/load-spark-env.sh +++ b/bin/load-spark-env.sh @@ -20,6 +20,7 @@ # This script loads spark-env.sh if it exists, and ensures it is only loaded once. # spark-env.sh is loaded from SPARK_CONF_DIR if set, or within the current directory's # conf/ subdirectory. +FWDIR="$(cd "`dirname "$0"`"/..; pwd)" if [ -z "$SPARK_ENV_LOADED" ]; then export SPARK_ENV_LOADED=1 --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
