GitHub user cloud-fan opened a pull request:

    https://github.com/apache/spark/pull/11648

    [HOT-FIX] fix compile

    Fix the compilation introduced by 
https://github.com/apache/spark/pull/11555 because of a merge conflict.

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/cloud-fan/spark hotbug

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/spark/pull/11648.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #11648
    
----
commit 4e0cea2dac1e5b6a80510a3728573337f416ad22
Author: Wenchen Fan <[email protected]>
Date:   2016-03-11T05:29:50Z

    fix compile

----


---
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]

Reply via email to