Repository: spark
Updated Branches:
  refs/heads/branch-1.1 d6ed5abf1 -> d9d94e0b0


Docs : use "--total-executor-cores" rather than "--cores" after spark-shell

Author: CrazyJvm <crazy...@gmail.com>

Closes #2540 from CrazyJvm/standalone-core and squashes the following commits:

66d9fc6 [CrazyJvm] use "--total-executor-cores" rather than "--cores" after 
spark-shell

(cherry picked from commit 66107f46f374f83729cd79ab260eb59fa123c041)
Signed-off-by: Andrew Or <andrewo...@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/d9d94e0b
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/d9d94e0b
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/d9d94e0b

Branch: refs/heads/branch-1.1
Commit: d9d94e0b007c2264e88e0b7b7826d3a0533cde2e
Parents: d6ed5ab
Author: CrazyJvm <crazy...@gmail.com>
Authored: Sat Sep 27 09:41:04 2014 -0700
Committer: Andrew Or <andrewo...@gmail.com>
Committed: Sat Sep 27 09:42:13 2014 -0700

----------------------------------------------------------------------
 docs/spark-standalone.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/d9d94e0b/docs/spark-standalone.md
----------------------------------------------------------------------
diff --git a/docs/spark-standalone.md b/docs/spark-standalone.md
index 29b5491..333ad5b 100644
--- a/docs/spark-standalone.md
+++ b/docs/spark-standalone.md
@@ -242,7 +242,7 @@ To run an interactive Spark shell against the cluster, run 
the following command
 
     ./bin/spark-shell --master spark://IP:PORT
 
-You can also pass an option `--cores <numCores>` to control the number of 
cores that spark-shell uses on the cluster.
+You can also pass an option `--total-executor-cores <numCores>` to control the 
number of cores that spark-shell uses on the cluster.
 
 # Launching Compiled Spark Applications
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org

Reply via email to