Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

spark
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

3bfaf3ab

Commit 3bfaf3ab authored 12 years ago by Matei Zaharia

Downloads
- Plain Diff

Merge pull request #379 from stephenh/sparkmem

Add spark.executor.memory to differentiate executor memory from spark-shell

parents 88ee6163 cae8a679

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

core/src/main/scala/spark/SparkContext.scala 2 additions, 1 deletion

core/src/main/scala/spark/SparkContext.scala
core/src/main/scala/spark/deploy/worker/ExecutorRunner.scala 1 addition, 2 deletions

core/src/main/scala/spark/deploy/worker/ExecutorRunner.scala
core/src/main/scala/spark/scheduler/cluster/SchedulerBackend.scala 12 additions, 0 deletions

...main/scala/spark/scheduler/cluster/SchedulerBackend.scala
core/src/main/scala/spark/scheduler/cluster/SparkDeploySchedulerBackend.scala 0 additions, 10 deletions

...spark/scheduler/cluster/SparkDeploySchedulerBackend.scala
core/src/main/scala/spark/scheduler/mesos/CoarseMesosSchedulerBackend.scala 0 additions, 10 deletions

...a/spark/scheduler/mesos/CoarseMesosSchedulerBackend.scala
core/src/main/scala/spark/scheduler/mesos/MesosSchedulerBackend.scala 2 additions, 12 deletions

...n/scala/spark/scheduler/mesos/MesosSchedulerBackend.scala

with 17 additions and 35 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment