diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2014-04-28 17:29:22 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-04-28 17:29:22 -0700 |
| commit | 949e393101e19cd00591a9930c4b364278e22609 (patch) | |
| tree | dcfa2c2337d25df917486f7f75771718a371055f /bin/compute-classpath.sh | |
| parent | cae054aaf41ca0ee585231896db67169b61af689 (diff) | |
| download | spark-949e393101e19cd00591a9930c4b364278e22609.tar.gz spark-949e393101e19cd00591a9930c4b364278e22609.tar.bz2 spark-949e393101e19cd00591a9930c4b364278e22609.zip | |
SPARK-1654 and SPARK-1653: Fixes in spark-submit.
Deals with two issues:
1. Spark shell didn't correctly pass quoted arguments to spark-submit.
```./bin/spark-shell --driver-java-options "-Dfoo=f -Dbar=b"```
2. Spark submit used deprecated environment variables (SPARK_CLASSPATH)
which triggered warnings. Now we use new, more narrowly scoped,
variables.
Author: Patrick Wendell <pwendell@gmail.com>
Closes #576 from pwendell/spark-submit and squashes the following commits:
67004c9 [Patrick Wendell] SPARK-1654 and SPARK-1653: Fixes in spark-submit.
Diffstat (limited to 'bin/compute-classpath.sh')
| -rwxr-xr-x | bin/compute-classpath.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/compute-classpath.sh b/bin/compute-classpath.sh index 3a59f599fd..b0218531e9 100755 --- a/bin/compute-classpath.sh +++ b/bin/compute-classpath.sh @@ -28,7 +28,7 @@ FWDIR="$(cd `dirname $0`/..; pwd)" . $FWDIR/bin/load-spark-env.sh # Build up classpath -CLASSPATH="$SPARK_CLASSPATH:$FWDIR/conf" +CLASSPATH="$SPARK_CLASSPATH:$SPARK_SUBMIT_CLASSPATH:$FWDIR/conf" ASSEMBLY_DIR="$FWDIR/assembly/target/scala-$SCALA_VERSION" |