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

8f11c36f

Commit 8f11c36f authored 11 years ago by Matei Zaharia

Downloads
- Plain Diff

Merge remote-tracking branch 'tgravescs/sparkYarnDistCache'

Closes #11

Conflicts:
	docs/running-on-yarn.md
	yarn/src/main/scala/org/apache/spark/deploy/yarn/ClientArguments.scala

parents c71499b7 0fff4ee8

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

core/src/main/scala/org/apache/spark/SparkContext.scala 14 additions, 3 deletions

core/src/main/scala/org/apache/spark/SparkContext.scala
docs/running-on-yarn.md 8 additions, 1 deletion

docs/running-on-yarn.md
yarn/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala 51 additions, 4 deletions

...cala/org/apache/spark/deploy/yarn/ApplicationMaster.scala
yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala 138 additions, 22 deletions

.../src/main/scala/org/apache/spark/deploy/yarn/Client.scala
yarn/src/main/scala/org/apache/spark/deploy/yarn/ClientArguments.scala 21 additions, 4 deletions

.../scala/org/apache/spark/deploy/yarn/ClientArguments.scala
yarn/src/main/scala/org/apache/spark/deploy/yarn/WorkerRunnable.scala 43 additions, 15 deletions

...n/scala/org/apache/spark/deploy/yarn/WorkerRunnable.scala

with 275 additions and 49 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