summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-03-31 16:30:34 +0200
committerGitHub <noreply@github.com>2020-03-31 16:30:34 +0200
commit7d4ab3fd8f48c7ded1a226f148e3677a1122c657 (patch)
treec69100edf52888f2927fc0a126615bffa3b46a0b /vendor
parent9b86835c3976dbe81807f22d31a6d993b0ec9dd5 (diff)
parent3838bb0062d90eb39a19924abb643169ce70e2c0 (diff)
downloadpodman-7d4ab3fd8f48c7ded1a226f148e3677a1122c657.tar.gz
podman-7d4ab3fd8f48c7ded1a226f148e3677a1122c657.tar.bz2
podman-7d4ab3fd8f48c7ded1a226f148e3677a1122c657.zip
Merge pull request #5518 from containers/dependabot/go_modules/github.com/containers/conmon-2.0.12incompatible
Bump github.com/containers/conmon from 2.0.10+incompatible to 2.0.14
Diffstat (limited to 'vendor')
-rw-r--r--vendor/modules.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 40bc53872..a1c28b023 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -86,7 +86,7 @@ github.com/containers/buildah/util
github.com/containers/common/pkg/capabilities
github.com/containers/common/pkg/config
github.com/containers/common/pkg/unshare
-# github.com/containers/conmon v2.0.10+incompatible
+# github.com/containers/conmon v2.0.14+incompatible
github.com/containers/conmon/runner/config
# github.com/containers/image/v5 v5.3.1
github.com/containers/image/v5/copy