diff options
| author | wangt <wangtao.upc@gmail.com> | 2015-11-25 11:41:05 -0800 |
|---|---|---|
| committer | Andrew Or <andrew@databricks.com> | 2015-11-25 11:41:05 -0800 |
| commit | 9f3e59a16822fb61d60cf103bd4f7823552939c6 (patch) | |
| tree | ca259eed420ae940287fdde0985a0d43100aff58 /bin | |
| parent | 83653ac5e71996c5a366a42170bed316b208f1b5 (diff) | |
| download | spark-9f3e59a16822fb61d60cf103bd4f7823552939c6.tar.gz spark-9f3e59a16822fb61d60cf103bd4f7823552939c6.tar.bz2 spark-9f3e59a16822fb61d60cf103bd4f7823552939c6.zip | |
[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.upc@gmail.com>
Closes #9863 from toddwan/master.
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/load-spark-env.cmd | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/load-spark-env.cmd b/bin/load-spark-env.cmd index 36d932c453..59080edd29 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 |