From afcad7b3aa8736231a526417ede47ce6d353a70c Mon Sep 17 00:00:00 2001
From: Andrew Ash <andrew@andrewash.com>
Date: Wed, 15 May 2013 14:45:14 -0300
Subject: Docs: Mention spark shell's default for MASTER

---
 docs/scala-programming-guide.md | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'docs/scala-programming-guide.md')

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
-- 
cgit v1.2.3