GitHub user liancheng opened a pull request:
https://github.com/apache/spark/pull/8614
[HOTFIX] [SQL] Fixes compilation error
Jenkins master builders are currently broken by a merge conflict between PR
#8584 and PR #8155.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/liancheng/spark
hotfix/fix-pr-8155-8584-conflict
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/spark/pull/8614.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 #8614
----
commit d763051c8edefa902f95b6f6e6fea33799fe8710
Author: Cheng Lian <[email protected]>
Date: 2015-09-05T08:51:49Z
Fixes compilation error
----
---
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]
