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 SPARK-14915 to branch-1.6 in
https://github.com/apache/spark/commit/bf3c0608f1779b4dd837b8289ec1d4516e145aea
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.)
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/srowen/spark SPARK-14915.2
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/spark/pull/12950.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #12950
----
commit fa55cea57be71b7842e573a76ae02cba0e9cc530
Author: Sean Owen <[email protected]>
Date: 2016-05-06T09:14:09Z
Fix incorrect resolution of merge conflict in commit
bf3c0608f1779b4dd837b8289ec1d4516e145aea to branch-1.6, which back-ported
SPARK-14915
----
---
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 enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
