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 2014/01/03 08:16:25 UTC
[13/32] git commit: Fix yarn/README.md and update
docs/running-on-yarn.md
Fix yarn/README.md and update docs/running-on-yarn.md
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/be343d2a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/be343d2a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/be343d2a
Branch: refs/heads/master
Commit: be343d2a567b8ba3824c5e186e046f96ff77e334
Parents: 67cd752
Author: Raymond Liu <ra...@intel.com>
Authored: Mon Dec 9 09:47:52 2013 +0800
Committer: Raymond Liu <ra...@intel.com>
Committed: Fri Jan 3 12:12:38 2014 +0800
----------------------------------------------------------------------
docs/running-on-yarn.md | 2 +-
yarn/README.md | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/be343d2a/docs/running-on-yarn.md
----------------------------------------------------------------------
diff --git a/docs/running-on-yarn.md b/docs/running-on-yarn.md
index aa75ca4..5f995ce 100644
--- a/docs/running-on-yarn.md
+++ b/docs/running-on-yarn.md
@@ -116,7 +116,7 @@ For example:
# Building Spark for Hadoop/YARN 2.2.x
-Hadoop 2.2.x users must build Spark and publish it locally. The SBT build process handles Hadoop 2.2.x as a special case. This version of Hadoop has new YARN API changes and depends on a Protobuf version (2.5) that is not compatible with the Akka version (2.0.5) that Spark uses. Therefore, if the Hadoop version (e.g. set through ```SPARK_HADOOP_VERSION```) starts with 2.2.0 or higher then the build process will depend on Akka artifacts distributed by the Spark project compatible with Protobuf 2.5. Furthermore, the build process then uses the directory ```new-yarn``` (instead of ```yarn```), which supports the new YARN API. The build process should seamlessly work out of the box.
+Hadoop 2.2.x users must build Spark and publish it locally. The SBT build process handles Hadoop 2.2.x as a special case. This version of Hadoop has new YARN API changes and depends on a Protobuf version (2.5) that is not compatible with the Akka version (2.0.5) that Spark uses. Therefore, if the Hadoop version (e.g. set through ```SPARK_HADOOP_VERSION```) starts with 2.2.0 or higher then the build process will depend on Akka artifacts distributed by the Spark project compatible with Protobuf 2.5.
See [Building Spark with Maven](building-with-maven.html) for instructions on how to build Spark using the Maven process.
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/be343d2a/yarn/README.md
----------------------------------------------------------------------
diff --git a/yarn/README.md b/yarn/README.md
index 3639f2c..e2c3aea 100644
--- a/yarn/README.md
+++ b/yarn/README.md
@@ -1,7 +1,5 @@
# YARN DIRECTORY LAYOUT
-Hadoop Yarn related code are organized
-
Hadoop Yarn related codes are organized in separate modules with layered dependency.
* common : Common codes that will be called into by other modules.