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

d3277a0d

Commit d3277a0d authored 11 years ago by Matei Zaharia

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/pr/792'

Conflicts:
	core/src/main/scala/spark/ui/jobs/IndexPage.scala
	core/src/main/scala/spark/ui/jobs/StagePage.scala

parents d17eeb99 14d14f45

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

core/src/main/scala/spark/SparkContext.scala 1 addition, 1 deletion

core/src/main/scala/spark/SparkContext.scala
core/src/main/scala/spark/scheduler/DAGScheduler.scala 14 additions, 12 deletions

core/src/main/scala/spark/scheduler/DAGScheduler.scala
core/src/main/scala/spark/scheduler/JobLogger.scala 18 additions, 64 deletions

core/src/main/scala/spark/scheduler/JobLogger.scala
core/src/main/scala/spark/scheduler/SparkListenerBus.scala 74 additions, 0 deletions

core/src/main/scala/spark/scheduler/SparkListenerBus.scala
core/src/main/scala/spark/ui/jobs/IndexPage.scala 51 additions, 61 deletions

core/src/main/scala/spark/ui/jobs/IndexPage.scala
core/src/main/scala/spark/ui/jobs/JobProgressListener.scala 13 additions, 24 deletions

core/src/main/scala/spark/ui/jobs/JobProgressListener.scala
core/src/main/scala/spark/ui/jobs/PoolPage.scala 11 additions, 9 deletions

core/src/main/scala/spark/ui/jobs/PoolPage.scala
core/src/main/scala/spark/ui/jobs/PoolTable.scala 10 additions, 5 deletions

core/src/main/scala/spark/ui/jobs/PoolTable.scala
core/src/main/scala/spark/ui/jobs/StagePage.scala 80 additions, 78 deletions

core/src/main/scala/spark/ui/jobs/StagePage.scala
core/src/main/scala/spark/ui/jobs/StageTable.scala 7 additions, 5 deletions

core/src/main/scala/spark/ui/jobs/StageTable.scala

with 279 additions and 259 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