aboutsummaryrefslogtreecommitdiff
path: root/core/src
diff options
context:
space:
mode:
authorPatrick Wendell <pwendell@gmail.com>2014-04-28 17:29:22 -0700
committerPatrick Wendell <pwendell@gmail.com>2014-04-28 17:29:22 -0700
commit949e393101e19cd00591a9930c4b364278e22609 (patch)
treedcfa2c2337d25df917486f7f75771718a371055f /core/src
parentcae054aaf41ca0ee585231896db67169b61af689 (diff)
downloadspark-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 'core/src')
-rw-r--r--core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala b/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala
index 58d9e9add7..5834dc40f1 100644
--- a/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala
@@ -298,7 +298,9 @@ private[spark] class SparkSubmitArguments(args: Seq[String]) {
| --driver-memory MEM Memory for driver (e.g. 1000M, 2G) (Default: 512M).
| --driver-java-options Extra Java options to pass to the driver
| --driver-library-path Extra library path entries to pass to the driver
- | --driver-class-path Extra class path entries to pass to the driver
+ | --driver-class-path Extra class path entries to pass to the driver. Note that
+ | jars added with --jars are automatically included in the
+ | classpath.
|
| --executor-memory MEM Memory per executor (e.g. 1000M, 2G) (Default: 1G).
|