diff options
| author | Andrew Ash <andrew@andrewash.com> | 2013-05-15 14:45:14 -0300 |
|---|---|---|
| committer | Andrew Ash <andrew@andrewash.com> | 2013-05-15 14:45:14 -0300 |
| commit | afcad7b3aa8736231a526417ede47ce6d353a70c (patch) | |
| tree | 04d2e878e1f9ec2c5cda235bfc59d45c3479e232 /docs/scala-programming-guide.md | |
| parent | 203d7b7c14144c382534dcc4feb887847ae136b1 (diff) | |
| download | spark-afcad7b3aa8736231a526417ede47ce6d353a70c.tar.gz spark-afcad7b3aa8736231a526417ede47ce6d353a70c.tar.bz2 spark-afcad7b3aa8736231a526417ede47ce6d353a70c.zip | |
Docs: Mention spark shell's default for MASTER
Diffstat (limited to 'docs/scala-programming-guide.md')
| -rw-r--r-- | docs/scala-programming-guide.md | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/scala-programming-guide.md b/docs/scala-programming-guide.md index 2315aadbdf..b0da130fcb 100644 --- a/docs/scala-programming-guide.md +++ b/docs/scala-programming-guide.md @@ -67,6 +67,8 @@ The master URL passed to Spark can be in one of the following formats: </td></tr> </table> +If no master URL is specified, the spark shell defaults to "local". + For running on YARN, Spark launches an instance of the standalone deploy cluster within YARN; see [running on YARN](running-on-yarn.html) for details. ### Deploying Code on a Cluster |