summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-06-16 19:40:37 +0200
committerGitHub <noreply@github.com>2020-06-16 19:40:37 +0200
commitd6965da26d194c7edfef65985d4a2c7b564a3fca (patch)
tree3def0c20925e94e8f67cb1615ed96ad54d5f653b /vendor
parent908bc3fba305666b3cd41b29bd775bb62f1f8f9f (diff)
parent51febc510a50ca02e47e53aef7bac2dd38652b2f (diff)
downloadpodman-d6965da26d194c7edfef65985d4a2c7b564a3fca.tar.gz
podman-d6965da26d194c7edfef65985d4a2c7b564a3fca.tar.bz2
podman-d6965da26d194c7edfef65985d4a2c7b564a3fca.zip
Merge pull request #6616 from containers/dependabot/go_modules/github.com/containers/conmon-2.0.18incompatible
Bump github.com/containers/conmon from 2.0.17+incompatible to 2.0.18+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 03a6e19de..59cf7a2ad 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.17+incompatible
+# github.com/containers/conmon v2.0.18+incompatible
github.com/containers/conmon/runner/config
# github.com/containers/image/v5 v5.4.5-0.20200529084758-46b2ee6aebb0
github.com/containers/image/v5/copy