Github user sarutak commented on the pull request:
https://github.com/apache/spark/pull/1886#issuecomment-53363176
@marmbrus I resolved merge conflicts.
@liancheng this PR includes your commit in #1944 without 81b43a8 , you need
resolve merge issue only about 81b43a8 in #1944 .
---
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]
