aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaymond Liu <raymond.liu@intel.com>2013-12-09 09:47:52 +0800
committerRaymond Liu <raymond.liu@intel.com>2014-01-03 12:12:38 +0800
commitbe343d2a567b8ba3824c5e186e046f96ff77e334 (patch)
tree8656a7e364d0e51796a17db4afddf4bdbfdd74f8
parent67cd752e746bf2c2202949e15dbb85faf8e3c482 (diff)
downloadspark-be343d2a567b8ba3824c5e186e046f96ff77e334.tar.gz
spark-be343d2a567b8ba3824c5e186e046f96ff77e334.tar.bz2
spark-be343d2a567b8ba3824c5e186e046f96ff77e334.zip
Fix yarn/README.md and update docs/running-on-yarn.md
-rw-r--r--docs/running-on-yarn.md2
-rw-r--r--yarn/README.md2
2 files changed, 1 insertions, 3 deletions
diff --git a/docs/running-on-yarn.md b/docs/running-on-yarn.md
index aa75ca4324..5f995ce51b 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.
diff --git a/yarn/README.md b/yarn/README.md
index 3639f2c364..e2c3aea9a8 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.