Github user feynmanliang commented on the pull request:
https://github.com/apache/spark/pull/7400#issuecomment-126797102
Hi @rikima
I resolved your merge conflicts with the latest version of master on #7837
Since I cherry-picked your commit your name will be in the commit log.
---
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]
