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

7e0191c6

Commit 7e0191c6 authored 11 years ago by Matei Zaharia

Downloads
- Plain Diff

Merge remote-tracking branch 'cgrothaus/SPARK-698'

Conflicts:
	run

parents f5e32ed1 f39f2b76

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

core/src/main/scala/spark/deploy/worker/ExecutorRunner.scala 29 additions, 4 deletions

core/src/main/scala/spark/deploy/worker/ExecutorRunner.scala
run 11 additions, 7 deletions

run
run2.cmd 5 additions, 2 deletions

run2.cmd

with 45 additions and 13 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