summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-05-13 13:31:03 -0700
committerGitHub <noreply@github.com>2020-05-13 13:31:03 -0700
commit5e245b02e9330dab6b161b88b8c13978c27ff5d9 (patch)
tree7e7a45c4d92936e8cbb62eae6d638377d3d57494 /vendor
parent3c58e4fc76d35c098b039b407291b35f66c7cae1 (diff)
parentc5f9e7f5229524ac704ed7b4ca797b6065d00ea3 (diff)
downloadpodman-5e245b02e9330dab6b161b88b8c13978c27ff5d9.tar.gz
podman-5e245b02e9330dab6b161b88b8c13978c27ff5d9.tar.bz2
podman-5e245b02e9330dab6b161b88b8c13978c27ff5d9.zip
Merge pull request #6206 from containers/dependabot/go_modules/github.com/containers/conmon-2.0.16incompatible
Bump github.com/containers/conmon from 2.0.14+incompatible to 2.0.16+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 765e68108..1bd87558c 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -89,7 +89,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.14+incompatible
+# github.com/containers/conmon v2.0.16+incompatible
github.com/containers/conmon/runner/config
# github.com/containers/image/v5 v5.4.4
github.com/containers/image/v5/copy