Merge pull request #902 from spadgett/cpu-donut-fix

OpenShift Bot · web-flow · commit 07653ad748a1 · 2016-11-21T12:23:32.000-05:00
Merged by openshift-bot
diff --git a/app/scripts/directives/podMetrics.js b/app/scripts/directives/podMetrics.js
@@ -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.
diff --git a/dist/scripts/scripts.js b/dist/scripts/scripts.js
@@ -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));
 }

Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,7 @@ angular.module('openshiftConsole')`
`213`	`213`	`return ConversionService.bytesToMiB(usageValueFilter(memLimit));`
`214`	`214`	`}`
`215`	`215`	`break;`
`216`		`- case 'cpu/usage':`
	`216`	`+ case 'cpu/usage_rate':`
`217`	`217`	`var cpuLimit = getCPULimit(container);`
`218`	`218`	`if (cpuLimit) {`
`219`	`219`	`// Convert cores to millicores.`