aboutsummaryrefslogtreecommitdiff
path: root/repl/scala-2.11
diff options
context:
space:
mode:
authorDavies Liu <davies.liu@gmail.com>2016-06-15 15:55:07 -0700
committerDavies Liu <davies.liu@gmail.com>2016-06-15 15:55:07 -0700
commita153e41c08b635b1b2a48b680d203c148deebc67 (patch)
tree552e2dc3e9146662f523f7eb3495fe0a1607b8f3 /repl/scala-2.11
parent1a33f2e05c8813ce1ff94e10d0c03fc7e5c403ce (diff)
downloadspark-a153e41c08b635b1b2a48b680d203c148deebc67.tar.gz
spark-a153e41c08b635b1b2a48b680d203c148deebc67.tar.bz2
spark-a153e41c08b635b1b2a48b680d203c148deebc67.zip
Revert "[SPARK-15782][YARN] Set spark.jars system property in client mode"
This reverts commit 4df8df5c2e68f5a5d231c401b04d762d7a648159.
Diffstat (limited to 'repl/scala-2.11')
-rw-r--r--repl/scala-2.11/src/main/scala/org/apache/spark/repl/Main.scala4
1 files changed, 3 insertions, 1 deletions
diff --git a/repl/scala-2.11/src/main/scala/org/apache/spark/repl/Main.scala b/repl/scala-2.11/src/main/scala/org/apache/spark/repl/Main.scala
index 28fe84d6fe..771670fa55 100644
--- a/repl/scala-2.11/src/main/scala/org/apache/spark/repl/Main.scala
+++ b/repl/scala-2.11/src/main/scala/org/apache/spark/repl/Main.scala
@@ -54,7 +54,9 @@ object Main extends Logging {
// Visible for testing
private[repl] def doMain(args: Array[String], _interp: SparkILoop): Unit = {
interp = _interp
- val jars = Utils.getUserJars(conf).mkString(File.pathSeparator)
+ val jars = conf.getOption("spark.jars")
+ .map(_.replace(",", File.pathSeparator))
+ .getOrElse("")
val interpArguments = List(
"-Yrepl-class-based",
"-Yrepl-outdir", s"${outputDir.getAbsolutePath}",