Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Closed
wants to merge 3 commits into from
Closed

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

wants to merge 3 commits into from

Conversation

liu-zhaokun
Copy link
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
Copy link
Member

srowen commented May 16, 2017

@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
Copy link
Contributor Author

@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
repl/scala-2.11/src/main/scala/org/apache/spark/repl/SparkILoop.scala Outdated
@@ -97,13 +97,13 @@ class SparkILoop(in0: Option[BufferedReader], out: JPrintWriter)
override def commands: List[LoopCommand] = sparkStandardCommands

/**
* We override `loadFiles` because we need to initialize Spark *before* the REPL
* We override `createInterpreter` because we need to initialize Spark *before* the REPL
Copy link
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

build/mvn Outdated
@@ -91,13 +91,13 @@ install_mvn() {

# 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"
Copy link
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
Copy link
Contributor Author

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

@liu-zhaokun
Copy link
Contributor Author

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

@srowen
Copy link
Member

srowen commented May 17, 2017

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

@SparkQA
Copy link

SparkQA commented May 17, 2017

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

@SparkQA
Copy link

SparkQA commented May 17, 2017

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

@liu-zhaokun
Copy link
Contributor Author

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

@liu-zhaokun
Copy link
Contributor Author

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

@SparkQA
Copy link

SparkQA commented May 19, 2017

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

@liu-zhaokun
Copy link
Contributor Author

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

@SparkQA
Copy link

SparkQA commented May 19, 2017

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 <[email protected]>

Closes #17992 from liu-zhaokun/new.

(cherry picked from commit dba2ca2)
Signed-off-by: Sean Owen <[email protected]>
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 <[email protected]>

Closes #17992 from liu-zhaokun/new.

(cherry picked from commit dba2ca2)
Signed-off-by: Sean Owen <[email protected]>
@srowen
Copy link
Member

srowen commented May 19, 2017

Merged to master/2.2/2.1

@asfgit asfgit closed this in dba2ca2 May 19, 2017
liyichao pushed a commit to liyichao/spark that referenced this pull request May 24, 2017
@liu-zhaokun @liyichao
[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 <[email protected]>

Closes apache#17992 from liu-zhaokun/new.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@srowen srowen srowen 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