Github user mengxr commented on the pull request:
https://github.com/apache/spark/pull/1026#issuecomment-45954951
@coderxiang The merge was not clean. It contains changes from my PR. Could
you re-merge the latest master and check the diff is correct on this page?
---
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.
---
