Repository: spark Updated Branches: refs/heads/master aa6966ff3 -> a11c8683c
[SPARK-7092] Update spark scala version to 2.11.6 Author: Prashant Sharma <prashan...@imaginea.com> Closes #5662 from ScrapCodes/SPARK-7092/scala-update-2.11.6 and squashes the following commits: 58cf4f9 [Prashant Sharma] [SPARK-7092] Update spark scala version to 2.11.6 Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/a11c8683 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/a11c8683 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/a11c8683 Branch: refs/heads/master Commit: a11c8683c76c67f45749a1b50a0912a731fd2487 Parents: aa6966f Author: Prashant Sharma <prashan...@imaginea.com> Authored: Sat Apr 25 18:07:34 2015 -0400 Committer: Sean Owen <so...@cloudera.com> Committed: Sat Apr 25 18:07:34 2015 -0400 ---------------------------------------------------------------------- pom.xml | 4 ++-- .../src/main/scala/org/apache/spark/repl/SparkIMain.scala | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/a11c8683/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 4b0b0c8..9fbce1d 100644 --- a/pom.xml +++ b/pom.xml @@ -1745,9 +1745,9 @@ <property><name>scala-2.11</name></property> </activation> <properties> - <scala.version>2.11.2</scala.version> + <scala.version>2.11.6</scala.version> <scala.binary.version>2.11</scala.binary.version> - <jline.version>2.12</jline.version> + <jline.version>2.12.1</jline.version> <jline.groupid>jline</jline.groupid> </properties> </profile> http://git-wip-us.apache.org/repos/asf/spark/blob/a11c8683/repl/scala-2.11/src/main/scala/org/apache/spark/repl/SparkIMain.scala ---------------------------------------------------------------------- diff --git a/repl/scala-2.11/src/main/scala/org/apache/spark/repl/SparkIMain.scala b/repl/scala-2.11/src/main/scala/org/apache/spark/repl/SparkIMain.scala index 1bb62c8..1cb910f 100644 --- a/repl/scala-2.11/src/main/scala/org/apache/spark/repl/SparkIMain.scala +++ b/repl/scala-2.11/src/main/scala/org/apache/spark/repl/SparkIMain.scala @@ -1129,7 +1129,7 @@ class SparkIMain(@BeanProperty val factory: ScriptEngineFactory, initialSettings def apply(line: String): Result = debugging(s"""parse("$line")""") { var isIncomplete = false - currentRun.reporting.withIncompleteHandler((_, _) => isIncomplete = true) { + currentRun.parsing.withIncompleteHandler((_, _) => isIncomplete = true) { reporter.reset() val trees = newUnitParser(line).parseStats() if (reporter.hasErrors) Error --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
