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

b25918d8

Commit b25918d8 authored 11 years ago by Ali Ghodsi

Downloads
- Plain Diff

Merge branch 'master' of https://github.com/alig/spark

Conflicts:
	core/src/main/scala/org/apache/spark/deploy/master/Master.scala

parents bd078850 cbfef9b3

No related branches found

No related tags found

No related merge requests found

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

core/src/main/scala/org/apache/spark/deploy/DeployMessage.scala 1 addition, 1 deletion

...rc/main/scala/org/apache/spark/deploy/DeployMessage.scala
core/src/main/scala/org/apache/spark/deploy/master/Master.scala 4 additions, 4 deletions

...rc/main/scala/org/apache/spark/deploy/master/Master.scala

with 5 additions and 5 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