Skip to content

Commit

Permalink
Merge pull request #902 from spadgett/cpu-donut-fix
Browse files Browse the repository at this point in the history
Merged by openshift-bot
  • Loading branch information
OpenShift Bot authored Nov 21, 2016
2 parents be99353 + 90783eb commit 07653ad
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion app/scripts/directives/podMetrics.js
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ angular.module('openshiftConsole')
return ConversionService.bytesToMiB(usageValueFilter(memLimit));
}
break;
case 'cpu/usage':
case 'cpu/usage_rate':
var cpuLimit = getCPULimit(container);
if (cpuLimit) {
// Convert cores to millicores.
Expand Down
2 changes: 1 addition & 1 deletion dist/scripts/scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -10476,7 +10476,7 @@ var c = w(b);
if (c) return g.bytesToMiB(i(c));
break;

case "cpu/usage":
case "cpu/usage_rate":
var d = x(b);
if (d) return _.round(1e3 * i(d));
}
Expand Down

0 comments on commit 07653ad

Please sign in to comment.