aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorAndrew Or <andrew@databricks.com>2015-03-24 16:41:31 -0700
committerAndrew Or <andrew@databricks.com>2015-03-24 16:41:31 -0700
commitf7c3668ee62d5b87a0fdf64614aa45c7409ff585 (patch)
treec924b22760de79ed16f1fe35ffe5eb80b52fb287 /core
parentd8ccf655f344eed65cdaf5d9252f1b565b8406ca (diff)
downloadspark-f7c3668ee62d5b87a0fdf64614aa45c7409ff585.tar.gz
spark-f7c3668ee62d5b87a0fdf64614aa45c7409ff585.tar.bz2
spark-f7c3668ee62d5b87a0fdf64614aa45c7409ff585.zip
Revert "[SPARK-5771][UI][hotfix] Change Requested Cores into * if default cores is not set"
This reverts commit 12135e90549f957962899487cd5eb95badd8976d.
Diffstat (limited to 'core')
-rw-r--r--core/src/main/scala/org/apache/spark/deploy/master/ui/MasterPage.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/main/scala/org/apache/spark/deploy/master/ui/MasterPage.scala b/core/src/main/scala/org/apache/spark/deploy/master/ui/MasterPage.scala
index 46509e39c0..9ab3c8f8fe 100644
--- a/core/src/main/scala/org/apache/spark/deploy/master/ui/MasterPage.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/master/ui/MasterPage.scala
@@ -218,7 +218,7 @@ private[ui] class MasterPage(parent: MasterWebUI) extends WebUIPage("") {
}
}
<td>
- {if (app.requestedCores == Int.MaxValue) "*" else app.requestedCores}
+ {app.requestedCores}
</td>
<td sorttable_customkey={app.desc.memoryPerSlave.toString}>
{Utils.megabytesToString(app.desc.memoryPerSlave)}