Skip to content

Commit ecf0e89

Browse files
committed
Merge remote-tracking branch 'origin/master' into thread-local-date-format
2 parents 8541602 + 5bef4fe commit ecf0e89

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

core/src/main/resources/org/apache/spark/ui/static/timeline-view.css

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,12 @@ rect.getting-result-time-proportion {
9898
cursor: pointer;
9999
}
100100

101-
.vis-timeline .vis-item.stage.succeeded {
101+
.vis-timeline .vis-item.stage.complete {
102102
background-color: #A0DFFF;
103103
border-color: #3EC0FF;
104104
}
105105

106-
.vis-timeline .vis-item.stage.succeeded.vis-selected {
106+
.vis-timeline .vis-item.stage.complete.vis-selected {
107107
background-color: #A0DFFF;
108108
border-color: #3EC0FF;
109109
z-index: auto;
@@ -130,12 +130,12 @@ rect.getting-result-time-proportion {
130130
stroke: #FF4D6D;
131131
}
132132

133-
.vis-timeline .vis-item.stage.running {
133+
.vis-timeline .vis-item.stage.active {
134134
background-color: #A2FCC0;
135135
border-color: #36F572;
136136
}
137137

138-
.vis-timeline .vis-item.stage.running.vis-selected {
138+
.vis-timeline .vis-item.stage.active.vis-selected {
139139
background-color: #A2FCC0;
140140
border-color: #36F572;
141141
z-index: auto;

core/src/main/scala/org/apache/spark/ui/jobs/JobPage.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ private[ui] class JobPage(parent: JobsTab, store: AppStatusStore) extends WebUIP
6262
val stageId = stage.stageId
6363
val attemptId = stage.attemptId
6464
val name = stage.name
65-
val status = stage.status.toString
65+
val status = stage.status.toString.toLowerCase(Locale.ROOT)
6666
val submissionTime = stage.submissionTime.get.getTime()
6767
val completionTime = stage.completionTime.map(_.getTime())
6868
.getOrElse(System.currentTimeMillis())

0 commit comments

Comments
 (0)