Github user rxin commented on the pull request: https://github.com/apache/spark/pull/1193#issuecomment-47193347 Merging this one so you can fix the conflict with this other.
--- 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 infrastruct...@apache.org or file a JIRA ticket with INFRA. ---