Commit 547fc4a4 authored 11 years ago by $Y.CORP.YAHOO.COM\tgraves's avatar$ Y.CORP.YAHOO.COM\tgraves

Merge remote-tracking branch 'mesos/master' into yarnUILink

Conflicts:
	core/src/main/scala/org/apache/spark/ui/UIUtils.scala
	core/src/main/scala/org/apache/spark/ui/jobs/PoolTable.scala
	core/src/main/scala/org/apache/spark/ui/jobs/StageTable.scala
	docs/running-on-yarn.md

parents 96452eea 59218bdd

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing with 316 additions and 127 deletions

Please register or to comment