You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ma...@apache.org on 2014/01/10 08:58:56 UTC
[1/2] git commit: Fix bug added when we changed
AppDescription.maxCores to an Option
Updated Branches:
refs/heads/master dd03cea02 -> 0ebc97305
Fix bug added when we changed AppDescription.maxCores to an Option
The Scala compiler warned about this -- we were comparing an Option
against an integer now.
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/c43eb006
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/c43eb006
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/c43eb006
Branch: refs/heads/master
Commit: c43eb006442bbab14f5cd0898b6ad0f39f273506
Parents: 26cdb5f
Author: Matei Zaharia <ma...@databricks.com>
Authored: Thu Jan 9 18:14:20 2014 -0800
Committer: Matei Zaharia <ma...@databricks.com>
Committed: Thu Jan 9 18:14:20 2014 -0800
----------------------------------------------------------------------
.../org/apache/spark/deploy/master/ui/ApplicationPage.scala | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/c43eb006/core/src/main/scala/org/apache/spark/deploy/master/ui/ApplicationPage.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/deploy/master/ui/ApplicationPage.scala b/core/src/main/scala/org/apache/spark/deploy/master/ui/ApplicationPage.scala
index dbb0cb9..9485bfd 100644
--- a/core/src/main/scala/org/apache/spark/deploy/master/ui/ApplicationPage.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/master/ui/ApplicationPage.scala
@@ -67,11 +67,11 @@ private[spark] class ApplicationPage(parent: MasterWebUI) {
<li><strong>User:</strong> {app.desc.user}</li>
<li><strong>Cores:</strong>
{
- if (app.desc.maxCores == Integer.MAX_VALUE) {
+ if (app.desc.maxCores == None) {
"Unlimited (%s granted)".format(app.coresGranted)
} else {
"%s (%s granted, %s left)".format(
- app.desc.maxCores, app.coresGranted, app.coresLeft)
+ app.desc.maxCores.get, app.coresGranted, app.coresLeft)
}
}
</li>
[2/2] git commit: Merge pull request #375 from mateiz/option-fix
Posted by ma...@apache.org.
Merge pull request #375 from mateiz/option-fix
Fix bug added when we changed AppDescription.maxCores to an Option
The Scala compiler warned about this -- we were comparing an Option against an integer now.
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/0ebc9730
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/0ebc9730
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/0ebc9730
Branch: refs/heads/master
Commit: 0ebc97305a0e23a9d2183c335998c800c5d865b7
Parents: dd03cea c43eb00
Author: Matei Zaharia <ma...@databricks.com>
Authored: Thu Jan 9 23:58:49 2014 -0800
Committer: Matei Zaharia <ma...@databricks.com>
Committed: Thu Jan 9 23:58:49 2014 -0800
----------------------------------------------------------------------
.../org/apache/spark/deploy/master/ui/ApplicationPage.scala | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------