diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-12-04 06:30:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-04 06:30:31 -0500 |
| commit | ec0411aecd74f5d604ded102e562541f5bd01a98 (patch) | |
| tree | 9e3576af8f75e7e57d2bf1313cbdf49f6028c2e4 | |
| parent | 05df0c50aed0639fe382efa7d7199083cc09dbc4 (diff) | |
| parent | 95b4478fb424a06511d94b89948b89acb26b360a (diff) | |
| download | podman-ec0411aecd74f5d604ded102e562541f5bd01a98.tar.gz podman-ec0411aecd74f5d604ded102e562541f5bd01a98.tar.bz2 podman-ec0411aecd74f5d604ded102e562541f5bd01a98.zip | |
Merge pull request #8569 from zhangguanzhang/fix-nit
Fix some nit in code and comment
| -rw-r--r-- | test/apiv2/20-containers.at | 2 | ||||
| -rw-r--r-- | utils/utils_supported.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/apiv2/20-containers.at b/test/apiv2/20-containers.at index b35c27215..5c35edf2b 100644 --- a/test/apiv2/20-containers.at +++ b/test/apiv2/20-containers.at @@ -169,7 +169,7 @@ t GET containers/$cid/json 200 \ .Args[1]="param2" t DELETE containers/$cid 204 -# test only set the entrpoint, Cmd should be [] +# test only set the entrypoint, Cmd should be [] t POST containers/create '"Image":"'$IMAGE'","Entrypoint":["echo","param1"]' 201 \ .Id~[0-9a-f]\\{64\\} cid=$(jq -r '.Id' <<<"$output") diff --git a/utils/utils_supported.go b/utils/utils_supported.go index e6978ca6f..6f517dc72 100644 --- a/utils/utils_supported.go +++ b/utils/utils_supported.go @@ -184,7 +184,7 @@ func moveUnderCgroup(cgroup, subtree string, processes []uint32) error { } for _, pid := range bytes.Split(processesData, []byte("\n")) { if _, err := f.Write(pid); err != nil { - logrus.Warnf("Cannot move process %d to cgroup %q", pid, newCgroup) + logrus.Warnf("Cannot move process %s to cgroup %q", string(pid), newCgroup) } } } |