diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-28 15:01:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-28 15:01:37 +0200 |
| commit | ec69497b18f70400b21e1ec198299f9fe4f1df7a (patch) | |
| tree | c6aad0097204c480a141e8bdb0bbc76475ef626c /pkg/api | |
| parent | 14f8085016bd7f3f5060e9c682abd5ecb2836fbe (diff) | |
| parent | f657e5551e8757039f4b80401b56b2f46006d32f (diff) | |
| download | podman-ec69497b18f70400b21e1ec198299f9fe4f1df7a.tar.gz podman-ec69497b18f70400b21e1ec198299f9fe4f1df7a.tar.bz2 podman-ec69497b18f70400b21e1ec198299f9fe4f1df7a.zip | |
Merge pull request #7105 from AkihiroSuda/fix-cgroupversion-string
compat/info.go: TrimPrefix(CGroupsVersion, "v")
Diffstat (limited to 'pkg/api')
| -rw-r--r-- | pkg/api/handlers/compat/info.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/api/handlers/compat/info.go b/pkg/api/handlers/compat/info.go index 6c44393cc..c0033eab4 100644 --- a/pkg/api/handlers/compat/info.go +++ b/pkg/api/handlers/compat/info.go @@ -119,7 +119,7 @@ func GetInfo(w http.ResponseWriter, r *http.Request) { BuildahVersion: infoData.Host.BuildahVersion, CPURealtimePeriod: sysInfo.CPURealtimePeriod, CPURealtimeRuntime: sysInfo.CPURealtimeRuntime, - CgroupVersion: infoData.Host.CGroupsVersion, + CgroupVersion: strings.TrimPrefix(infoData.Host.CGroupsVersion, "v"), Rootless: rootless.IsRootless(), SwapFree: infoData.Host.SwapFree, SwapTotal: infoData.Host.SwapTotal, |