aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorPrashant Sharma <prashant.s@imaginea.com>2013-10-05 15:52:57 +0530
committerPrashant Sharma <prashant.s@imaginea.com>2013-10-05 15:52:57 +0530
commitc810ee0690d536873b1046541cdf1b492902a60e (patch)
tree05dc901858682ab877ffa7cfb5a304a369c199ea /docs
parent582969288592063ea4071080e8ff7b9108cf4a8b (diff)
parent232765f7b26d933caa14e0e1bc0e4937dae90523 (diff)
downloadspark-c810ee0690d536873b1046541cdf1b492902a60e.tar.gz
spark-c810ee0690d536873b1046541cdf1b492902a60e.tar.bz2
spark-c810ee0690d536873b1046541cdf1b492902a60e.zip
Merge branch 'master' into scala-2.10
Conflicts: core/src/test/scala/org/apache/spark/DistributedSuite.scala project/SparkBuild.scala
Diffstat (limited to 'docs')
-rw-r--r--docs/running-on-yarn.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/running-on-yarn.md b/docs/running-on-yarn.md
index c611db0af4..30128ec45d 100644
--- a/docs/running-on-yarn.md
+++ b/docs/running-on-yarn.md
@@ -50,6 +50,7 @@ The command to launch the YARN Client is as follows:
--master-memory <MEMORY_FOR_MASTER> \
--worker-memory <MEMORY_PER_WORKER> \
--worker-cores <CORES_PER_WORKER> \
+ --name <application_name> \
--queue <queue_name>
For example: