You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by zj...@apache.org on 2018/04/05 12:49:59 UTC
zeppelin git commit: Hotfix: ambiguous reference to overloaded
definition
Repository: zeppelin
Updated Branches:
refs/heads/master 881846364 -> 7a9572d67
Hotfix: ambiguous reference to overloaded definition
### What is this PR for?
Minor bugfix on Zeppelin build from sources
### What type of PR is it?
Bug Fix
### What is the Jira issue?
* https://issues.apache.org/jira/browse/ZEPPELIN-3324
### How should this be tested?
* mvn clean package \
--batch-mode package \
-Phelium-dev \
-Pscala-2.11 \
-Dscala.version=2.11.8 \
-Dscala.binary.version=2.11 \
-Pbuild-distr \
-Pspark-2.1 \
-Dspark.version=2.1.1 \
-Pr \
-Pcassandra-spark-1.5 \
-Psparkr \
-Ppyspark \
-Phadoop-2.7 \
-Dhadoop.version=2.7.3 \
-Dmaven.findbugs.enable=false \
-Drat.skip=true \
-Dcheckstyle.skip=true \
-DskipTests
### Screenshots (if appropriate)
### Questions:
* Does the licenses files need update? N
* Is there breaking changes for older versions? N
* Does this needs documentation? N
Author: Nelson Costa <ne...@gmail.com>
Closes #2863 from necosta/ZEPPELIN-3324 and squashes the following commits:
a0de334 [Nelson Costa] Hotfix: ambiguous reference to overloaded definition
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/7a9572d6
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/7a9572d6
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/7a9572d6
Branch: refs/heads/master
Commit: 7a9572d67e4f02c6ad49ac091d6bc542732c19fc
Parents: 8818463
Author: Nelson Costa <ne...@gmail.com>
Authored: Wed Mar 7 14:58:26 2018 +0000
Committer: Jeff Zhang <zj...@apache.org>
Committed: Thu Apr 5 20:49:25 2018 +0800
----------------------------------------------------------------------
.../scala/org/apache/zeppelin/spark/SparkScala210Interpreter.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/7a9572d6/spark/scala-2.10/src/main/scala/org/apache/zeppelin/spark/SparkScala210Interpreter.scala
----------------------------------------------------------------------
diff --git a/spark/scala-2.10/src/main/scala/org/apache/zeppelin/spark/SparkScala210Interpreter.scala b/spark/scala-2.10/src/main/scala/org/apache/zeppelin/spark/SparkScala210Interpreter.scala
index 43aa864..9d371ba 100644
--- a/spark/scala-2.10/src/main/scala/org/apache/zeppelin/spark/SparkScala210Interpreter.scala
+++ b/spark/scala-2.10/src/main/scala/org/apache/zeppelin/spark/SparkScala210Interpreter.scala
@@ -67,7 +67,7 @@ class SparkScala210Interpreter(override val conf: SparkConf,
settings.usejavacp.value = true
settings.classpath.value = getUserJars.mkString(File.pathSeparator)
Console.setOut(interpreterOutput)
- sparkILoop = new SparkILoop(null, new JPrintWriter(Console.out, true))
+ sparkILoop = new SparkILoop()
setDeclaredField(sparkILoop, "settings", settings)
callMethod(sparkILoop, "createInterpreter")