summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-06-04 14:16:53 +0200
committerGitHub <noreply@github.com>2020-06-04 14:16:53 +0200
commit08ce2c1b2f5d3338959476d0c0c0e6d36f7e3e43 (patch)
treefd0babf993f723e980eff8de7c514dfce85dcc85 /vendor
parentff99c3ecb36f7a46165cae2f963efd94da61b1ac (diff)
parent02324b916a2659f650a82dcce877e5a51b863a45 (diff)
downloadpodman-08ce2c1b2f5d3338959476d0c0c0e6d36f7e3e43.tar.gz
podman-08ce2c1b2f5d3338959476d0c0c0e6d36f7e3e43.tar.bz2
podman-08ce2c1b2f5d3338959476d0c0c0e6d36f7e3e43.zip
Merge pull request #6404 from containers/dependabot/go_modules/github.com/containers/conmon-2.0.17incompatible
Bump github.com/containers/conmon from 2.0.16+incompatible to 2.0.17+incompatible
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 e7232d5a2..b6498b3af 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -91,7 +91,7 @@ github.com/containers/common/pkg/capabilities
github.com/containers/common/pkg/cgroupv2
github.com/containers/common/pkg/config
github.com/containers/common/pkg/sysinfo
-# github.com/containers/conmon v2.0.16+incompatible
+# github.com/containers/conmon v2.0.17+incompatible
github.com/containers/conmon/runner/config
# github.com/containers/image/v5 v5.4.5-0.20200529084758-46b2ee6aebb0
github.com/containers/image/v5/copy