Repository: spark Updated Branches: refs/heads/branch-1.6 97317d346 -> 7b720bf1c
[SPARK-11880][WINDOWS][SPARK SUBMIT] bin/load-spark-env.cmd loads spark-env.cmd from wrong directory * On windows the `bin/load-spark-env.cmd` tries to load `spark-env.cmd` from `%~dp0..\..\conf`, where `~dp0` points to `bin` and `conf` is only one level up. * Updated `bin/load-spark-env.cmd` to load `spark-env.cmd` from `%~dp0..\conf`, instead of `%~dp0..\..\conf` Author: wangt <wangtao....@gmail.com> Closes #9863 from toddwan/master. (cherry picked from commit 9f3e59a16822fb61d60cf103bd4f7823552939c6) Signed-off-by: Andrew Or <and...@databricks.com> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/7b720bf1 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/7b720bf1 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/7b720bf1 Branch: refs/heads/branch-1.6 Commit: 7b720bf1c4860fdb560540744c5fdfb333b752bc Parents: 97317d3 Author: wangt <wangtao....@gmail.com> Authored: Wed Nov 25 11:41:05 2015 -0800 Committer: Andrew Or <and...@databricks.com> Committed: Wed Nov 25 11:41:12 2015 -0800 ---------------------------------------------------------------------- bin/load-spark-env.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/7b720bf1/bin/load-spark-env.cmd ---------------------------------------------------------------------- diff --git a/bin/load-spark-env.cmd b/bin/load-spark-env.cmd index 36d932c..59080ed 100644 --- a/bin/load-spark-env.cmd +++ b/bin/load-spark-env.cmd @@ -27,7 +27,7 @@ if [%SPARK_ENV_LOADED%] == [] ( if not [%SPARK_CONF_DIR%] == [] ( set user_conf_dir=%SPARK_CONF_DIR% ) else ( - set user_conf_dir=%~dp0..\..\conf + set user_conf_dir=%~dp0..\conf ) call :LoadSparkEnv --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
