aboutsummaryrefslogtreecommitdiff
path: root/python/pyspark/context.py
diff options
context:
space:
mode:
authorMatei Zaharia <matei@databricks.com>2013-12-29 14:46:59 -0500
committerMatei Zaharia <matei@databricks.com>2013-12-29 14:46:59 -0500
commit58c6fa2041b99160f254b17c2b71de9d82c53f8c (patch)
treef42a22c90232793074a5e2c93db5884a3e222e3d /python/pyspark/context.py
parent615fb649d66b13371927a051d249433d746c5f19 (diff)
downloadspark-58c6fa2041b99160f254b17c2b71de9d82c53f8c.tar.gz
spark-58c6fa2041b99160f254b17c2b71de9d82c53f8c.tar.bz2
spark-58c6fa2041b99160f254b17c2b71de9d82c53f8c.zip
Add Python docs about SparkConf
Diffstat (limited to 'python/pyspark/context.py')
-rw-r--r--python/pyspark/context.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/python/pyspark/context.py b/python/pyspark/context.py
index 9d75c2b6f1..1244a1495f 100644
--- a/python/pyspark/context.py
+++ b/python/pyspark/context.py
@@ -53,7 +53,8 @@ class SparkContext(object):
def __init__(self, master=None, appName=None, sparkHome=None, pyFiles=None,
environment=None, batchSize=1024, serializer=PickleSerializer(), conf=None):
"""
- Create a new SparkContext.
+ Create a new SparkContext. At least the master and app name should be set,
+ either through the named parameters here or through C{conf}.
@param master: Cluster URL to connect to
(e.g. mesos://host:port, spark://host:port, local[4]).