Repository: spark Updated Branches: refs/heads/master 5e5ad6558 -> 12135e905
[SPARK-5771][UI][hotfix] Change Requested Cores into * if default cores is not set cc andrewor14, srowen. Author: jerryshao <saisai.s...@intel.com> Closes #4800 from jerryshao/SPARK-5771 and squashes the following commits: a2483c2 [jerryshao] Change the UI of Requested Cores into * if default cores is not set Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/12135e90 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/12135e90 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/12135e90 Branch: refs/heads/master Commit: 12135e90549f957962899487cd5eb95badd8976d Parents: 5e5ad65 Author: jerryshao <saisai.s...@intel.com> Authored: Thu Feb 26 22:35:43 2015 -0800 Committer: Andrew Or <and...@databricks.com> Committed: Thu Feb 26 22:35:43 2015 -0800 ---------------------------------------------------------------------- .../main/scala/org/apache/spark/deploy/master/ui/MasterPage.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/12135e90/core/src/main/scala/org/apache/spark/deploy/master/ui/MasterPage.scala ---------------------------------------------------------------------- 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 9dd9649..c7a71ea 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 @@ -182,7 +182,7 @@ private[spark] class MasterPage(parent: MasterWebUI) extends WebUIPage("") { } } <td> - {app.requestedCores} + {if (app.requestedCores == Int.MaxValue) "*" else app.requestedCores} </td> <td sorttable_customkey={app.desc.memoryPerSlave.toString}> {Utils.megabytesToString(app.desc.memoryPerSlave)} --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
