Github user srowen closed the pull request at:
https://github.com/apache/spark/pull/12950
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is ena
Github user AmplabJenkins commented on the pull request:
https://github.com/apache/spark/pull/12950#issuecomment-217413684
Merged build finished. Test PASSed.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your projec
Github user AmplabJenkins commented on the pull request:
https://github.com/apache/spark/pull/12950#issuecomment-217413686
Test PASSed.
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder/
Github user SparkQA commented on the pull request:
https://github.com/apache/spark/pull/12950#issuecomment-217413612
**[Test build #57974 has
finished](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/57974/consoleFull)**
for PR 12950 at commit
[`fa55cea`](https://g
Github user SparkQA commented on the pull request:
https://github.com/apache/spark/pull/12950#issuecomment-217394140
**[Test build #57974 has
started](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/57974/consoleFull)**
for PR 12950 at commit
[`fa55cea`](https://gi
GitHub user srowen opened a pull request:
https://github.com/apache/spark/pull/12950
[SPARK-14915] Fix incorrect resolution of merge conflict in commit
bf3c0608f1779b4dd837b8289ec1d4516e145aea
## What changes were proposed in this pull request?
I botched the back-port of SP
