Updated Branches: refs/heads/branch-0.9 574741f28 -> dc8adf158
Merge pull request #489 from ash211/patch-6 Clarify spark.default.parallelism It's the task count across the cluster, not per worker, per machine, per core, or anything else. (cherry picked from commit 749f842827c7e7766a342b6b0a437803044a9f90) Signed-off-by: Patrick Wendell <pwend...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/dc8adf15 Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/dc8adf15 Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/dc8adf15 Branch: refs/heads/branch-0.9 Commit: dc8adf158e78b6501b4672e0389c18c3034f30b9 Parents: 574741f Author: Reynold Xin <r...@apache.org> Authored: Tue Jan 21 14:53:49 2014 -0800 Committer: Patrick Wendell <pwend...@gmail.com> Committed: Mon Feb 3 22:41:30 2014 -0800 ---------------------------------------------------------------------- docs/configuration.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/dc8adf15/docs/configuration.md ---------------------------------------------------------------------- diff --git a/docs/configuration.md b/docs/configuration.md index 7fb4f26..07d1eb0 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -98,7 +98,7 @@ Apart from these, the following properties are also available, and may be useful <td>spark.default.parallelism</td> <td>8</td> <td> - Default number of tasks to use for distributed shuffle operations (<code>groupByKey</code>, + Default number of tasks to use across the cluster for distributed shuffle operations (<code>groupByKey</code>, <code>reduceByKey</code>, etc) when not set by user. </td> </tr>
