Skip to content

Conversation

@michellemay
Copy link
Contributor

What changes were proposed in this pull request?

Exclude jline from curator-recipes since it conflicts with scala 2.11 when running spark-shell. Should not affect scala 2.10 since it is builtin.

How was this patch tested?

Ran spark-shell manually.

Exclude jline from curator-recipes since it conflicts with scala 2.11.  Should not affect scala 2.10 since it is builtin.
@michellemay michellemay changed the title Update pom.xml [SPARK-13710] Fix jline dependency on Windows Mar 29, 2016
@michellemay michellemay changed the title [SPARK-13710] Fix jline dependency on Windows [SPARK-13710] [Shell] [Windows] Fix jline dependency on Windows Mar 29, 2016
@srowen
Copy link
Member

srowen commented Mar 29, 2016

Jenkins test this please

@SparkQA
Copy link

SparkQA commented Mar 29, 2016

Test build #54456 has finished for PR 12043 at commit 39b9b65.

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

@srowen
Copy link
Member

srowen commented Mar 31, 2016

merged to master

@asfgit asfgit closed this in 3cfbeb7 Mar 31, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants