Github user cmccabe commented on the pull request:
https://github.com/apache/spark/pull/1486#issuecomment-57529171
I just rebased on master and re-pushed. It looks like this merge conflict
was caused by another change to the MimaExcludes file, just like the previous
merge conflict.
---
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]
