Github user srowen commented on the pull request:

    https://github.com/apache/spark/pull/10487#issuecomment-168478981
  
    @QiangCai the merge commit is wrong as you can see. You can revert it, 
commit, rebase from master, fix conflicts, and force-push a merge to fix. Or, 
if you're not sure how to do it, close this PR and open a new one.


---
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]

Reply via email to