Repository: spark Updated Branches: refs/heads/branch-1.0 9013197f8 -> 44d70de96
[SPARK-2003] Fix python SparkContext example Author: Matthew Farrellee <[email protected]> Closes #1246 from mattf/SPARK-2003 and squashes the following commits: b12e7ca [Matthew Farrellee] [SPARK-2003] Fix python SparkContext example (cherry picked from commit 0e0686d3ef88e024fcceafe36a0cdbb953f5aeae) Signed-off-by: Patrick Wendell <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/44d70de9 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/44d70de9 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/44d70de9 Branch: refs/heads/branch-1.0 Commit: 44d70de96732995a282e3dd62978df92b3a7cb10 Parents: 9013197 Author: Matthew Farrellee <[email protected]> Authored: Fri Jun 27 18:20:33 2014 -0700 Committer: Patrick Wendell <[email protected]> Committed: Fri Jun 27 18:20:47 2014 -0700 ---------------------------------------------------------------------- docs/programming-guide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/44d70de9/docs/programming-guide.md ---------------------------------------------------------------------- diff --git a/docs/programming-guide.md b/docs/programming-guide.md index 494fd8e..d84055b 100644 --- a/docs/programming-guide.md +++ b/docs/programming-guide.md @@ -145,7 +145,7 @@ that contains information about your application. {% highlight python %} conf = SparkConf().setAppName(appName).setMaster(master) -sc = SparkContext(conf) +sc = SparkContext(conf=conf) {% endhighlight %} </div>
