Skip to content

[SPARK-20759] SCALA_VERSION in _config.yml should be consistent with pom.xml - #17992

Closed
liu-zhaokun wants to merge 3 commits into
apache:masterfrom
liu-zhaokun:new
Closed

[SPARK-20759] SCALA_VERSION in _config.yml should be consistent with pom.xml#17992
liu-zhaokun wants to merge 3 commits into
apache:masterfrom
liu-zhaokun:new

Conversation

@liu-zhaokun

@liu-zhaokunliu-zhaokun commented May 16, 2017

Copy link
Copy Markdown
Contributor

https://issues.apache.org/jira/browse/SPARK-20759
SCALA_VERSION in _config.yml is 2.11.7, but 2.11.8 in pom.xml. So I think SCALA_VERSION in _config.yml should be consistent with pom.xml.

@srowen

srowen commented May 16, 2017

Copy link
Copy Markdown
Member

@liu-zhaokun there are more changes to be made. Please make all the changes in https://github.com/apache/spark/pull/17982/files but don't update to 2.11.11; stay on 2.11.8.

@liu-zhaokun

liu-zhaokun commented May 16, 2017

Copy link
Copy Markdown
ContributorAuthor

@srowen
Hello, I have made some changes according to your advice.Please review the new PR?

srowen
srowen requested changes May 16, 2017
View reviewed changes
Comment threadrepl/scala-2.11/src/main/scala/org/apache/spark/repl/SparkILoop.scala Outdated

/**
* We override `loadFiles` because we need to initialize Spark *before* the REPL
* We override `createInterpreter` because we need to initialize Spark *before* the REPL

@srowensrowenMay 16, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I meant you should follow the version changes. You can't take this change; it depends on 2.11.11

Comment threadbuild/mvn Outdated
# Install zinc under the build/ folder
install_zinc() {
local zinc_path="zinc-0.3.11/bin/zinc"
local zinc_path="zinc-0.3.15/bin/zinc"

@srowensrowenMay 16, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't change the zinc version here

@liu-zhaokun

liu-zhaokun commented May 16, 2017

Copy link
Copy Markdown
ContributorAuthor

@srowen
Thanks for your reply.I modified the files again.Please review it.

@liu-zhaokun

liu-zhaokun commented May 17, 2017

Copy link
Copy Markdown
ContributorAuthor

@srowen
Hi,could you help me merge this PR?

@srowen

srowen commented May 17, 2017

Copy link
Copy Markdown
Member

It isn't tested yet, no. Jenkins isn't working right now

@SparkQA

SparkQA commented May 17, 2017

Copy link
Copy Markdown

Test build #3718 has started for PR 17992 at commit 7f0c75a.

@SparkQA

SparkQA commented May 17, 2017

Copy link
Copy Markdown

Test build #3719 has started for PR 17992 at commit 7f0c75a.

@liu-zhaokun

liu-zhaokun commented May 18, 2017

Copy link
Copy Markdown
ContributorAuthor

@srowen
The test doesn't finish,need I do anything?

@liu-zhaokun

liu-zhaokun commented May 19, 2017

Copy link
Copy Markdown
ContributorAuthor

@srowen
Hello,do you know how to finish the test?

@SparkQA

SparkQA commented May 19, 2017

Copy link
Copy Markdown

Test build #3723 has started for PR 17992 at commit 7f0c75a.

@liu-zhaokun

liu-zhaokun commented May 19, 2017

Copy link
Copy Markdown
ContributorAuthor

@srowen
Hi,do you know why this PR can't pass the test? I don't think it's my problem.

@SparkQA

SparkQA commented May 19, 2017

Copy link
Copy Markdown

Test build #3732 has finished for PR 17992 at commit 7f0c75a.

  • This patch passes all tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

asfgit pushed a commit that referenced this pull request May 19, 2017
@liu-zhaokun@srowen
[SPARK-20759] SCALA_VERSION in _config.yml should be consistent with …
001b82c
…pom.xml
[https://issues.apache.org/jira/browse/SPARK-20759](https://issues.apache.org/jira/browse/SPARK-20759)
SCALA_VERSION in _config.yml is 2.11.7, but 2.11.8 in pom.xml. So I think SCALA_VERSION in _config.yml should be consistent with pom.xml.
Author: liuzhaokun <liu.zhaokun@zte.com.cn>
Closes#17992 from liu-zhaokun/new.
(cherry picked from commit dba2ca2)
Signed-off-by: Sean Owen <sowen@cloudera.com>
asfgit pushed a commit that referenced this pull request May 19, 2017
@liu-zhaokun@srowen
[SPARK-20759] SCALA_VERSION in _config.yml should be consistent with …
c53fe79
…pom.xml
[https://issues.apache.org/jira/browse/SPARK-20759](https://issues.apache.org/jira/browse/SPARK-20759)
SCALA_VERSION in _config.yml is 2.11.7, but 2.11.8 in pom.xml. So I think SCALA_VERSION in _config.yml should be consistent with pom.xml.
Author: liuzhaokun <liu.zhaokun@zte.com.cn>
Closes#17992 from liu-zhaokun/new.
(cherry picked from commit dba2ca2)
Signed-off-by: Sean Owen <sowen@cloudera.com>
@srowen

srowen commented May 19, 2017

Copy link
Copy Markdown
Member

Merged to master/2.2/2.1

lycplus pushed a commit to lycplus/spark that referenced this pull request May 24, 2017
@liu-zhaokun@lycplus
[SPARK-20759] SCALA_VERSION in _config.yml should be consistent with …
325bc75
…pom.xml
[https://issues.apache.org/jira/browse/SPARK-20759](https://issues.apache.org/jira/browse/SPARK-20759)
SCALA_VERSION in _config.yml is 2.11.7, but 2.11.8 in pom.xml. So I think SCALA_VERSION in _config.yml should be consistent with pom.xml.
Author: liuzhaokun <liu.zhaokun@zte.com.cn>
Closesapache#17992 from liu-zhaokun/new.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@srowensrowensrowen approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@liu-zhaokun@srowen@SparkQA