From b21eeb7bcf35160eb2574bd1601fa468cbb9d0ee Mon Sep 17 00:00:00 2001 From: Paul Bellamy Date: Tue, 2 Feb 2016 16:17:58 +0000 Subject: [PATCH] key of process.CPUUsage changed, while waiting to merge --- render/detailed/labels.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/render/detailed/labels.go b/render/detailed/labels.go index 9d0fae36a..af4ac20c0 100644 --- a/render/detailed/labels.go +++ b/render/detailed/labels.go @@ -37,12 +37,12 @@ var labels = map[string]string{ kubernetes.PodID: "ID", overlay.WeaveDNSHostname: "Weave DNS Hostname", overlay.WeaveMACAddress: "Weave MAC", - // process.CPUUsage: "CPU", // Duplicate key! - process.Cmdline: "Command", - process.MemoryUsage: "Memory", - process.PID: "PID", - process.PPID: "Parent PID", - process.Threads: "# Threads", + process.CPUUsage: "CPU", + process.Cmdline: "Command", + process.MemoryUsage: "Memory", + process.PID: "PID", + process.PPID: "Parent PID", + process.Threads: "# Threads", } // Label maps from the internal keys to the human-readable label for a piece