[SPARK-14915] Fix incorrect resolution of merge conflict in commit bf3c0608f1779b4dd837b8289ec1d4516e145aea #12950
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…h-1.6, which back-ported SPARK-14915
|
Test build #57974 has finished for PR 12950 at commit
|
asfgit
pushed a commit
that referenced
this pull request
May 6, 2016
…3c060 ## What changes were proposed in this pull request? I botched the back-port of SPARK-14915 to branch-1.6 in bf3c060 resulting in a code block being added twice. This simply removes it, such that the net change is the intended one. ## How was this patch tested? Jenkins tests. (This in theory has already been tested.) Author: Sean Owen <[email protected]> Closes #12950 from srowen/SPARK-14915.2.
zzcclp
pushed a commit
to zzcclp/spark
that referenced
this pull request
May 9, 2016
…3c060 ## What changes were proposed in this pull request? I botched the back-port of SPARK-14915 to branch-1.6 in apache@bf3c060 resulting in a code block being added twice. This simply removes it, such that the net change is the intended one. ## How was this patch tested? Jenkins tests. (This in theory has already been tested.) Author: Sean Owen <[email protected]> Closes apache#12950 from srowen/SPARK-14915.2. (cherry picked from commit a3aa22a)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What changes were proposed in this pull request?
I botched the back-port of SPARK-14915 to branch-1.6 in bf3c060 resulting in a code block being added twice. This simply removes it, such that the net change is the intended one.
How was this patch tested?
Jenkins tests. (This in theory has already been tested.)