Merge 3340137 into de47a62

mesosphere · Jan 22, 2016 · 2d2ebc3 · 2d2ebc3
2 parents de47a62 + 3340137
commit 2d2ebc3
Show file tree

Hide file tree

Showing 3 changed files with 411 additions and 142 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,8 @@
 - \#3054 - Empty - non set- application attributes are accidentaly submited
   by the UI
 - \#3064 - Labels dropdown menu not showing up
+- \#3063 - After scaling a healthy app to 0, it appears to be Infinity%
+  overcapacity
 
 ## 0.15.0 - 2016-01-20
 ### Added

diff --git a/src/js/components/AppHealthDetailComponent.jsx b/src/js/components/AppHealthDetailComponent.jsx
@@ -43,7 +43,7 @@ var AppHealthDetailComponent = React.createClass({
 
   renderItem: function (state) {
     var health = this.getHealth(state);
-    var totalInstances = this.props.model.instances;
+    var totalInstances = this.props.model.instances || 1;
     var instances = health.quantity;
     var percentage = Math.round((instances / totalInstances) * 100);
     var label = healthStatusLabels[state];