Repository: spark Updated Branches: refs/heads/master cc91e2187 -> 38148f737
[SPARK-12761][CORE] Remove duplicated code Removes some duplicated code that was reintroduced during a merge. Author: Jakob Odersky <joder...@gmail.com> Closes #10711 from jodersky/repl-2.11-duplicate. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/38148f73 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/38148f73 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/38148f73 Branch: refs/heads/master Commit: 38148f7373ee678cd538ce5eae0a75e15c62db8a Parents: cc91e21 Author: Jakob Odersky <joder...@gmail.com> Authored: Wed Jan 13 11:53:59 2016 -0800 Committer: Reynold Xin <r...@databricks.com> Committed: Wed Jan 13 11:53:59 2016 -0800 ---------------------------------------------------------------------- .../scala-2.11/src/main/scala/org/apache/spark/repl/Main.scala | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/38148f73/repl/scala-2.11/src/main/scala/org/apache/spark/repl/Main.scala ---------------------------------------------------------------------- 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 44650f2..bb3081d 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 @@ -30,11 +30,7 @@ object Main extends Logging { val conf = new SparkConf() val rootDir = conf.getOption("spark.repl.classdir").getOrElse(Utils.getLocalDir(conf)) val outputDir = Utils.createTempDir(root = rootDir, namePrefix = "repl") - val s = new Settings() - s.processArguments(List("-Yrepl-class-based", - "-Yrepl-outdir", s"${outputDir.getAbsolutePath}", - "-classpath", getAddedJars.mkString(File.pathSeparator)), true) - // the creation of SecurityManager has to be lazy so SPARK_YARN_MODE is set if needed + var sparkContext: SparkContext = _ var sqlContext: SQLContext = _ var interp = new SparkILoop // this is a public var because tests reset it. --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org