diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-30 22:03:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-30 22:03:59 -0400 |
| commit | 1b784b4c3509e94b9e5b2f6bb432042978bd2fb6 (patch) | |
| tree | f0069c5b95494b7ef8ee078ea29937e7f7e7750f /cmd | |
| parent | 4132b71478c486b3f4eff6a344ee1b2defbab86f (diff) | |
| parent | 2764d18751f21ec324255f42e5083469afb0e600 (diff) | |
| download | podman-1b784b4c3509e94b9e5b2f6bb432042978bd2fb6.tar.gz podman-1b784b4c3509e94b9e5b2f6bb432042978bd2fb6.tar.bz2 podman-1b784b4c3509e94b9e5b2f6bb432042978bd2fb6.zip | |
Merge pull request #7161 from Luap99/fix#7160
fix swapped mem_usage/percent fields
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/containers/stats.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/podman/containers/stats.go b/cmd/podman/containers/stats.go index 2b4c46647..ddb5f32ef 100644 --- a/cmd/podman/containers/stats.go +++ b/cmd/podman/containers/stats.go @@ -230,8 +230,8 @@ func outputJSON(stats []*containerStats) error { Id: j.ID(), Name: j.Name, CpuPercent: j.CPUPerc(), - MemUsage: j.MemPerc(), - MemPerc: j.MemUsage(), + MemUsage: j.MemUsage(), + MemPerc: j.MemPerc(), NetIO: j.NetIO(), BlockIO: j.BlockIO(), Pids: j.PIDS(), |