Merge branch 'master' of git://git.apache.org/spark into SPARK-2670

apache · Jul 31, 2014 · e8713cc · e8713cc
2 parents d353984 + 669e3f0
commit e8713cc
Showing 1 changed file with 0 additions and 3 deletions.
diff --git 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