Github user squito commented on the pull request:
https://github.com/apache/spark/pull/6205#issuecomment-117722520
Hi @BryanCutler sorry for the delay on my mind. Thanks for updating.
Unfortunately looks like there are more conflicts with master, looks like you
need to merge again.
---
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]
