summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-07-16 09:12:35 -0400
committerGitHub <noreply@github.com>2020-07-16 09:12:35 -0400
commit984fffcdbcfe4754e0d329d2e204afb1fd82dbec (patch)
treeb42c3d387db3fdde877eff57c4eb063aef2f71d1
parentfbce0a9388406fa7f5862288628a125f3a87d7f6 (diff)
parent66e8b106459cfd184c6d8656ed340e8f6be53ce1 (diff)
downloadpodman-984fffcdbcfe4754e0d329d2e204afb1fd82dbec.tar.gz
podman-984fffcdbcfe4754e0d329d2e204afb1fd82dbec.tar.bz2
podman-984fffcdbcfe4754e0d329d2e204afb1fd82dbec.zip
Merge pull request #6998 from containers/dependabot/go_modules/github.com/containers/conmon-2.0.19incompatible
Bump github.com/containers/conmon from 2.0.18+incompatible to 2.0.19+incompatible
-rw-r--r--go.mod2
-rw-r--r--go.sum4
-rw-r--r--vendor/modules.txt2
3 files changed, 4 insertions, 4 deletions
diff --git a/go.mod b/go.mod
index 0904ca8b5..3f418eca6 100644
--- a/go.mod
+++ b/go.mod
@@ -12,7 +12,7 @@ require (
github.com/containernetworking/plugins v0.8.6
github.com/containers/buildah v1.15.1-0.20200708111410-d2ea9429455d
github.com/containers/common v0.15.2
- github.com/containers/conmon v2.0.18+incompatible
+ github.com/containers/conmon v2.0.19+incompatible
github.com/containers/image/v5 v5.5.1
github.com/containers/psgo v1.5.1
github.com/containers/storage v1.21.1
diff --git a/go.sum b/go.sum
index 737f1415b..62f8d8193 100644
--- a/go.sum
+++ b/go.sum
@@ -74,8 +74,8 @@ github.com/containers/buildah v1.15.1-0.20200708111410-d2ea9429455d h1:HgJJn1UBF
github.com/containers/buildah v1.15.1-0.20200708111410-d2ea9429455d/go.mod h1:HUAiD1mCGPFPcIuk5zls1LElLhXo7Q3hWDwheojjyAs=
github.com/containers/common v0.15.2 h1:KNNnSxeWRlghZPTVu07pjMWCRKvDObWykglf4ZFVDVI=
github.com/containers/common v0.15.2/go.mod h1:rhpXuGLTEKsk/xX/x0iKGHjRadMHpBd2ZiNDugwXPEM=
-github.com/containers/conmon v2.0.18+incompatible h1:rjwjNnE756NuXcdE/uUmj4kDbrykslPuBMHI31wh43E=
-github.com/containers/conmon v2.0.18+incompatible/go.mod h1:hgwZ2mtuDrppv78a/cOBNiCm6O0UMWGx1mu7P00nu5I=
+github.com/containers/conmon v2.0.19+incompatible h1:1bDVRvHy2MUNTUT/SW6LlHsJHQBTSwXvnKNdcB/a1vQ=
+github.com/containers/conmon v2.0.19+incompatible/go.mod h1:hgwZ2mtuDrppv78a/cOBNiCm6O0UMWGx1mu7P00nu5I=
github.com/containers/image/v5 v5.5.1 h1:h1FCOXH6Ux9/p/E4rndsQOC4yAdRU0msRTfLVeQ7FDQ=
github.com/containers/image/v5 v5.5.1/go.mod h1:4PyNYR0nwlGq/ybVJD9hWlhmIsNra4Q8uOQX2s6E2uM=
github.com/containers/libtrust v0.0.0-20190913040956-14b96171aa3b h1:Q8ePgVfHDplZ7U33NwHZkrVELsZP5fYj9pM5WBZB2GE=
diff --git a/vendor/modules.txt b/vendor/modules.txt
index ae0ba5668..14ad0411d 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -92,7 +92,7 @@ github.com/containers/common/pkg/cgroupv2
github.com/containers/common/pkg/config
github.com/containers/common/pkg/sysinfo
github.com/containers/common/version
-# github.com/containers/conmon v2.0.18+incompatible
+# github.com/containers/conmon v2.0.19+incompatible
github.com/containers/conmon/runner/config
# github.com/containers/image/v5 v5.5.1
github.com/containers/image/v5/copy