You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2013/12/17 07:42:36 UTC
[7/7] git commit: Merge pull request #268 from
pwendell/shaded-protobuf
Merge pull request #268 from pwendell/shaded-protobuf
Add support for 2.2. to master (via shaded jars)
This patch does a few related things. NOTE: This may not compile correctly for ~24 hours until artifacts fully propagate to Maven Central.
1. Uses shaded versions of akka/protobuf. For more information on how these versions were prepared, see [1].
2. Brings the `new-yarn` project up-to-date with the changes for Akka 2.2.3.
3. Some clean-up of the build now that we don't have to switch akka groups for different YARN versions.
[1]
https://github.com/pwendell/spark-utils/tree/933a309ef85c22643e8e4b5e365652101c4e95de/shaded-protobuf
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/7a8169be
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/7a8169be
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/7a8169be
Branch: refs/heads/master
Commit: 7a8169be9a0b6b3d0d53a98aa38940d47b201296
Parents: 964a3b6 10c0ffa
Author: Patrick Wendell <pw...@gmail.com>
Authored: Mon Dec 16 22:42:21 2013 -0800
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Mon Dec 16 22:42:21 2013 -0800
----------------------------------------------------------------------
README.md | 6 +-
core/pom.xml | 8 --
new-yarn/pom.xml | 6 +-
.../spark/deploy/yarn/WorkerLauncher.scala | 13 ++--
.../deploy/yarn/YarnAllocationHandler.scala | 2 +-
pom.xml | 79 +++++++++++---------
project/SparkBuild.scala | 32 +++-----
7 files changed, 64 insertions(+), 82 deletions(-)
----------------------------------------------------------------------