You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ma...@apache.org on 2014/01/08 06:30:43 UTC
[6/6] git commit: Merge pull request #350 from mateiz/standalone-limit
Merge pull request #350 from mateiz/standalone-limit
Add way to limit default # of cores used by apps in standalone mode
Also documents the spark.deploy.spreadOut option, and fixes a config option that had a dash in its name.
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/d75dc428
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/d75dc428
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/d75dc428
Branch: refs/heads/master
Commit: d75dc428dae72add407aec2c134a25537e754303
Parents: 61674bc 2c42174
Author: Matei Zaharia <ma...@databricks.com>
Authored: Wed Jan 8 00:30:03 2014 -0500
Committer: Matei Zaharia <ma...@databricks.com>
Committed: Wed Jan 8 00:30:03 2014 -0500
----------------------------------------------------------------------
.../main/scala/org/apache/spark/SparkConf.scala | 7 ++++-
.../scala/org/apache/spark/SparkContext.scala | 2 +-
.../spark/deploy/ApplicationDescription.scala | 2 +-
.../apache/spark/deploy/client/TestClient.scala | 2 +-
.../spark/deploy/master/ApplicationInfo.scala | 7 +++--
.../org/apache/spark/deploy/master/Master.scala | 11 +++++--
.../cluster/SparkDeploySchedulerBackend.scala | 2 +-
.../apache/spark/deploy/JsonProtocolSuite.scala | 5 +--
.../deploy/worker/ExecutorRunnerTest.scala | 2 +-
docs/configuration.md | 33 +++++++++++++++++---
docs/css/bootstrap.min.css | 2 +-
docs/job-scheduling.md | 5 ++-
docs/spark-standalone.md | 10 ++++++
13 files changed, 70 insertions(+), 20 deletions(-)
----------------------------------------------------------------------