Updated Branches: refs/heads/master 33fcb91e8 -> c708e8179
Clarify spark.cores.max It controls the count of cores across the cluster, not on a per-machine basis. Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/2dd4fb56 Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/2dd4fb56 Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/2dd4fb56 Branch: refs/heads/master Commit: 2dd4fb5698220bc33acb878254d41704221573bd Parents: a2e7e04 Author: Andrew Ash <and...@andrewash.com> Authored: Mon Jan 6 09:01:46 2014 -0800 Committer: Andrew Ash <and...@andrewash.com> Committed: Mon Jan 6 09:01:46 2014 -0800 ---------------------------------------------------------------------- docs/configuration.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/2dd4fb56/docs/configuration.md ---------------------------------------------------------------------- diff --git a/docs/configuration.md b/docs/configuration.md index 567aba0..09342fe 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -81,7 +81,8 @@ there are at least five properties that you will commonly want to control: <td> When running on a <a href="spark-standalone.html">standalone deploy cluster</a> or a <a href="running-on-mesos.html#mesos-run-modes">Mesos cluster in "coarse-grained" - sharing mode</a>, how many CPU cores to request at most. The default will use all available cores + sharing mode</a>, the maximum amount of CPU cores to request for the application from + across the cluster (not from each machine). The default will use all available cores offered by the cluster manager. </td> </tr>
