aboutsummaryrefslogtreecommitdiff
path: root/libpod
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-03-21 13:20:46 +0100
committerGitHub <noreply@github.com>2022-03-21 13:20:46 +0100
commit18d333f53d9567ffc0e86af8eb512a0524e2b115 (patch)
tree5829d9072a19efc5cbb2027ac2da92ad2eb6428f /libpod
parent248dbf6089922903d12553497a2faae27d1b503b (diff)
parent026bd9b2055fd65f7eabf1f2d435e43e3801cf84 (diff)
downloadpodman-18d333f53d9567ffc0e86af8eb512a0524e2b115.tar.gz
podman-18d333f53d9567ffc0e86af8eb512a0524e2b115.tar.bz2
podman-18d333f53d9567ffc0e86af8eb512a0524e2b115.zip
Merge pull request #13573 from vrothberg/golangci-lint
bump golangci-lint to v1.45.0
Diffstat (limited to 'libpod')
-rw-r--r--libpod/oci_conmon_linux.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go
index 735b1f09b..0e8aed93a 100644
--- a/libpod/oci_conmon_linux.go
+++ b/libpod/oci_conmon_linux.go
@@ -1371,7 +1371,7 @@ func (r *ConmonOCIRuntime) sharedConmonArgs(ctr *Container, cuuid, bundlePath, p
case define.JSONLogging:
fallthrough
//lint:ignore ST1015 the default case has to be here
- default: //nolint-stylecheck
+ default: //nolint:stylecheck
// No case here should happen except JSONLogging, but keep this here in case the options are extended
logrus.Errorf("%s logging specified but not supported. Choosing k8s-file logging instead", ctr.LogDriver())
fallthrough