You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2014/07/31 08:38:42 UTC
git commit: automatically set master according to `spark.master` in
`spark-defaults....
Repository: spark
Updated Branches:
refs/heads/master 5a110da25 -> 669e3f058
automatically set master according to `spark.master` in `spark-defaults....
automatically set master according to `spark.master` in `spark-defaults.conf`
Author: CrazyJvm <cr...@gmail.com>
Closes #1644 from CrazyJvm/standalone-guide and squashes the following commits:
bb12b95 [CrazyJvm] automatically set master according to `spark.master` in `spark-defaults.conf`
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/669e3f05
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/669e3f05
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/669e3f05
Branch: refs/heads/master
Commit: 669e3f05895d9dfa37abf60f60aecebb03988e50
Parents: 5a110da
Author: CrazyJvm <cr...@gmail.com>
Authored: Wed Jul 30 23:37:25 2014 -0700
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Wed Jul 30 23:38:29 2014 -0700
----------------------------------------------------------------------
docs/spark-standalone.md | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/669e3f05/docs/spark-standalone.md
----------------------------------------------------------------------
diff --git a/docs/spark-standalone.md b/docs/spark-standalone.md
index ad8b6c0..2fb3076 100644
--- a/docs/spark-standalone.md
+++ b/docs/spark-standalone.md
@@ -242,9 +242,6 @@ To run an interactive Spark shell against the cluster, run the following command
./bin/spark-shell --master spark://IP:PORT
-Note that if you are running spark-shell from one of the spark cluster machines, the `bin/spark-shell` script will
-automatically set MASTER from the `SPARK_MASTER_IP` and `SPARK_MASTER_PORT` variables in `conf/spark-env.sh`.
-
You can also pass an option `--cores <numCores>` to control the number of cores that spark-shell uses on the cluster.
# Launching Compiled Spark Applications