Commit 185ffd4
[ZEPPELIN-4962]. Support for manually specifying the Java version of Spark Interpreter Scala REPL and fix the CI failure due to low Scala version
### What is this PR for?
- fix the [CI failure](https://travis-ci.org/github/apache/zeppelin/builds/709913046) due to [PR-3852](apache#3852)
### What type of PR is it?
[Bug Fix]
### Todos
* [ ] - Task
### What is the Jira issue?
* [ZEPPELIN-4962](https://issues.apache.org/jira/projects/ZEPPELIN/issues/ZEPPELIN-4962)
### How should this be tested?
* CI test
### Screenshots (if appropriate)
### Questions:
* Does the licenses files need update? NO
* Is there breaking changes for older versions? NO
* Does this needs documentation? Yes
Author: xiejiajun <xiejiajun02@163.com>
Author: xie-jia-jun <xiejiajun02@163.com>
Author: JakeXie <xiejiajun02@163.com>
Closes apache#3860 from xiejiajun/ZEPPELIN-4962 and squashes the following commits:
9128c9b [JakeXie] spark.repl.target docs update
ad4c0e3 [xiejiajun] Clear irrelevant code
a12d3a9 [xiejiajun] Support for manually specifying the Java version of Spark Interpreter Scala REPL and fix the CI failure due to low Scala version
ab2b191 [xiejiajun] Merge branch 'master' of https://github.com/apache/zeppelin into apache-master
5569788 [xiejiajun] Merge branch 'master' of https://github.com/apache/zeppelin into apache-master
0a9af6c [xiejiajun] Merge branch 'master' of https://github.com/apache/zeppelin into apache-master
be36b37 [xiejiajun] 合并Apache Master分支冲突解决
1335d55 [xiejiajun] Merge remote-tracking branch 'origin/master'
fc59f57 [JakeXie] Merge pull request apache#4 from apache/master
9cc70fe [xiejiajun] Merge remote-tracking branch 'origin/master'
6ef9b23 [xie-jia-jun] Merge pull request apache#3 from apache/master
45af87a [xiejiajun] added timeout for getting Thrift client to avoid situations where the interpreter may not be restarted when the interpreter process exits unexpectedly
f149c3b [xie-jia-jun] Merge pull request #1 from apache/master
5d4b645 [xie-jia-jun] Support OSSConfigStorage of Aliyun
dbb6639 [xie-jia-jun] Add Aliyun OSS SDK
bb47849 [xie-jia-jun] Support S3ConfigStorage of AWS1 parent 7d18dd7 commit 185ffd4
3 files changed
Lines changed: 17 additions & 1 deletion
File tree
- docs/interpreter
- spark
- scala-2.10/src/main/scala/org/apache/zeppelin/spark
- scala-2.11/src/main/scala/org/apache/zeppelin/spark
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
200 | 200 | | |
201 | 201 | | |
202 | 202 | | |
203 | | - | |
| 203 | + | |
| 204 | + | |
204 | 205 | | |
205 | 206 | | |
206 | 207 | | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
207 | 218 | | |
208 | 219 | | |
209 | 220 | | |
| |||
Lines changed: 3 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
67 | 67 | | |
68 | 68 | | |
69 | 69 | | |
| 70 | + | |
70 | 71 | | |
71 | 72 | | |
72 | 73 | | |
73 | 74 | | |
| 75 | + | |
| 76 | + | |
74 | 77 | | |
75 | 78 | | |
76 | 79 | | |
| |||
Lines changed: 2 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
66 | 66 | | |
67 | 67 | | |
68 | 68 | | |
| 69 | + | |
69 | 70 | | |
70 | 71 | | |
71 | 72 | | |
72 | 73 | | |
73 | 74 | | |
74 | 75 | | |
| 76 | + | |
75 | 77 | | |
76 | 78 | | |
77 | 79 | | |
| |||
0 commit comments