GitHub user kostya-sh opened a pull request:

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

    [SPARK-7042][BUILD] use the standard akka artifacts with hadoop-2.x

    Both akka 2.3.x and hadoop-2.x use protobuf 2.5 so only hadoop-1 build needs
    custom 2.3.4-spark akka version that shades protobuf-2.5
    
    This partially fixes SPARK-7042 (for hadoop-2.x builds)

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

    $ git pull https://github.com/kostya-sh/spark master

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

    https://github.com/apache/spark/pull/6253.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 #6253
    
----
commit e48e6ebcaaf0316cb59f2396e1b8adcd2a3a7088
Author: Konstantin Shaposhnikov <[email protected]>
Date:   2015-05-19T03:51:33Z

    [SPARK-7042][BUILD] use the standard akka artifacts with hadoop-2.x
    
    Both akka 2.3.x and hadoop-2.x use protobuf 2.5 so only hadoop-1 build needs
    custom 2.3.4-spark akka version that shades protobuf-2.5
    
    This partially fixes SPARK-7042 (for hadoop-2.x builds)

----


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