Skip to content
Snippets Groups Projects
Commit f33662c1 authored by Matei Zaharia's avatar Matei Zaharia
Browse files

Merge remote-tracking branch 'pwendell/starvation-check' 

Also fixed a bug where master was offering executors on dead workers

Conflicts:
	core/src/main/scala/spark/deploy/master/Master.scala
parents 7341de0d 2ed791fd
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment