aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMatei Zaharia <matei@eecs.berkeley.edu>2013-08-20 10:14:15 -0700
committerMatei Zaharia <matei@eecs.berkeley.edu>2013-08-20 10:14:15 -0700
commitaa2b89d98d6d195a38e36c1947d437ab7346e5c9 (patch)
tree9638d8825a43f9e8b69dcf91a653d76d6e319ec0 /docs
parentd61337f6403da454b9fb6cf090fe3ab61892a11b (diff)
parent6f6944c8079bffdd088ddb0a84fbf83356e294ea (diff)
downloadspark-aa2b89d98d6d195a38e36c1947d437ab7346e5c9.tar.gz
spark-aa2b89d98d6d195a38e36c1947d437ab7346e5c9.tar.bz2
spark-aa2b89d98d6d195a38e36c1947d437ab7346e5c9.zip
Merge remote-tracking branch 'jey/hadoop-agnostic'
Conflicts: core/src/main/scala/spark/PairRDDFunctions.scala
Diffstat (limited to 'docs')
-rw-r--r--docs/running-on-yarn.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/running-on-yarn.md b/docs/running-on-yarn.md
index 66fb8d73e8..9c2cedfd88 100644
--- a/docs/running-on-yarn.md
+++ b/docs/running-on-yarn.md
@@ -55,7 +55,7 @@ This would be used to connect to the cluster, write to the dfs and submit jobs t
The command to launch the YARN Client is as follows:
- SPARK_JAR=<SPARK_YAR_FILE> ./run spark.deploy.yarn.Client \
+ SPARK_JAR=<SPARK_YARN_JAR_FILE> ./run spark.deploy.yarn.Client \
--jar <YOUR_APP_JAR_FILE> \
--class <APP_MAIN_CLASS> \
--args <APP_MAIN_ARGUMENTS> \
@@ -68,7 +68,7 @@ The command to launch the YARN Client is as follows:
For example:
- SPARK_JAR=./core/target/spark-core-assembly-{{site.SPARK_VERSION}}.jar ./run spark.deploy.yarn.Client \
+ SPARK_JAR=./yarn/target/spark-yarn-assembly-{{site.SPARK_VERSION}}.jar ./run spark.deploy.yarn.Client \
--jar examples/target/scala-{{site.SCALA_VERSION}}/spark-examples_{{site.SCALA_VERSION}}-{{site.SPARK_VERSION}}.jar \
--class spark.examples.SparkPi \
--args yarn-standalone \