diff options
author | Prashant Sharma <prashant.s@imaginea.com> | 2013-09-26 11:27:16 +0530 |
---|---|---|
committer | Prashant Sharma <prashant.s@imaginea.com> | 2013-09-26 11:40:02 +0530 |
commit | 604dc409969923d1e175e2d77fb0ddcac09c9d31 (patch) | |
tree | 4c8e6bd221f333e2ccffe8ad7b85c79996e3fe7a /docs | |
parent | 7ff4c2d399e1497966689cbe13edf2cd2a9a29b1 (diff) | |
parent | 834686b108ce31cbee531d89de6c6e80913448f4 (diff) | |
download | spark-604dc409969923d1e175e2d77fb0ddcac09c9d31.tar.gz spark-604dc409969923d1e175e2d77fb0ddcac09c9d31.tar.bz2 spark-604dc409969923d1e175e2d77fb0ddcac09c9d31.zip |
Sync with master and some build fixes
Diffstat (limited to 'docs')
-rw-r--r-- | docs/_config.yml | 2 | ||||
-rw-r--r-- | docs/building-with-maven.md | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/_config.yml b/docs/_config.yml index e7a96c0c70..ad851673a5 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -6,5 +6,5 @@ markdown: kramdown SPARK_VERSION: 0.8.0-SNAPSHOT SPARK_VERSION_SHORT: 0.8.0 SCALA_VERSION: 2.10 -MESOS_VERSION: 0.9.0-incubating +MESOS_VERSION: 0.13.0 SPARK_ISSUE_TRACKER_URL: https://spark-project.atlassian.net diff --git a/docs/building-with-maven.md b/docs/building-with-maven.md index 7ecb601ddd..19c01e179f 100644 --- a/docs/building-with-maven.md +++ b/docs/building-with-maven.md @@ -37,13 +37,13 @@ For Apache Hadoop versions 1.x, Cloudera CDH MRv1, and other Hadoop versions wit # Cloudera CDH 4.2.0 with MapReduce v1 $ mvn -Dhadoop.version=2.0.0-mr1-cdh4.2.0 -DskipTests clean package -For Apache Hadoop 2.x, 0.23.x, Cloudera CDH MRv2, and other Hadoop versions with YARN, you should also enable the "hadoop2-yarn" profile: +For Apache Hadoop 2.x, 0.23.x, Cloudera CDH MRv2, and other Hadoop versions with YARN, you should enable the "hadoop2-yarn" profile and set the "yarn.version" property: # Apache Hadoop 2.0.5-alpha - $ mvn -Phadoop2-yarn -Dhadoop.version=2.0.5-alpha -DskipTests clean package + $ mvn -Phadoop2-yarn -Dhadoop.version=2.0.5-alpha -Dyarn.version=2.0.5-alpha -DskipTests clean package # Cloudera CDH 4.2.0 with MapReduce v2 - $ mvn -Phadoop2-yarn -Dhadoop.version=2.0.0-cdh4.2.0 -DskipTests clean package + $ mvn -Phadoop2-yarn -Dhadoop.version=2.0.0-cdh4.2.0 -Dyarn.version=2.0.0-chd4.2.0 -DskipTests clean package ## Spark Tests in Maven ## |