diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-05-24 17:15:28 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-24 17:15:28 +0200 |
commit | 4d6b66a452416b79fe5b6b6615ee5076763a44df (patch) | |
tree | 4cbe6e33833cc49e7a56872869209f0e72d3852a /docs | |
parent | 2311a02c38d42b5e0cf3981a35701c77b1b4f6d0 (diff) | |
parent | 2f5552c32d01678bfbfdbb8838e1672d62521a6c (diff) | |
download | podman-4d6b66a452416b79fe5b6b6615ee5076763a44df.tar.gz podman-4d6b66a452416b79fe5b6b6615ee5076763a44df.tar.bz2 podman-4d6b66a452416b79fe5b6b6615ee5076763a44df.zip |
Merge pull request #10387 from flouthoc/cgroupv1-v2-info
Podman info add support for status of standard available cgroup controllers
Diffstat (limited to 'docs')
-rw-r--r-- | docs/source/markdown/podman-info.1.md | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/docs/source/markdown/podman-info.1.md b/docs/source/markdown/podman-info.1.md index 4af51d3eb..227fbd92d 100644 --- a/docs/source/markdown/podman-info.1.md +++ b/docs/source/markdown/podman-info.1.md @@ -32,6 +32,12 @@ $ podman info host: arch: amd64 buildahVersion: 1.19.0-dev + cgroupControllers: + - cpuset + - cpu + - io + - memory + - pids cgroupManager: systemd cgroupVersion: v2 conmon: @@ -145,6 +151,13 @@ Run podman info with JSON formatted response: "buildahVersion": "1.19.0-dev", "cgroupManager": "systemd", "cgroupVersion": "v2", + "cgroupControllers": [ + "cpuset", + "cpu", + "io", + "memory", + "pids" + ], "conmon": { "package": "conmon-2.0.22-2.fc33.x86_64", "path": "/usr/bin/conmon", |