Github user srowen commented on the pull request:
https://github.com/apache/spark/pull/8385#issuecomment-142091885
This has a merge conflict now, sorry. It might be easier even to squash all
your commits, then rebase, if you're up for it. In any event, it does just need
a rebase on master and a force push.
---
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]
