summaryrefslogtreecommitdiff
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
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
-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 81c906e60..77245bd4d 100644
--- a/go.mod
+++ b/go.mod
@@ -12,7 +12,7 @@ require (
github.com/containernetworking/plugins v0.8.6
github.com/containers/buildah v1.14.9-0.20200523094741-de0f541d9224
github.com/containers/common v0.13.1
- github.com/containers/conmon v2.0.17+incompatible
+ github.com/containers/conmon v2.0.18+incompatible
github.com/containers/image/v5 v5.4.5-0.20200529084758-46b2ee6aebb0
github.com/containers/psgo v1.5.1
github.com/containers/storage v1.20.2
diff --git a/go.sum b/go.sum
index c559ccdd4..0f47266ae 100644
--- a/go.sum
+++ b/go.sum
@@ -72,8 +72,8 @@ github.com/containers/buildah v1.14.9-0.20200523094741-de0f541d9224/go.mod h1:5Z
github.com/containers/common v0.11.2/go.mod h1:2w3QE6VUmhltGYW4wV00h4okq1Crs7hNI1ZD2I0QRUY=
github.com/containers/common v0.13.1 h1:6aE/IIxPPQk8DmND87tsWU1Aop/7mCC0T3dk/fZdm3k=
github.com/containers/common v0.13.1/go.mod h1:Kg9Enw+WOUa9pwx47fzxEdzOn5+ofYXjBJdCyaCeSSA=
-github.com/containers/conmon v2.0.17+incompatible h1:8BooocmNIwjOwAUGAoDD6fi3u0RrFyQ/fDkQzdiVtrI=
-github.com/containers/conmon v2.0.17+incompatible/go.mod h1:hgwZ2mtuDrppv78a/cOBNiCm6O0UMWGx1mu7P00nu5I=
+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/image/v5 v5.4.3/go.mod h1:pN0tvp3YbDd7BWavK2aE0mvJUqVd2HmhPjekyWSFm0U=
github.com/containers/image/v5 v5.4.4/go.mod h1:g7cxNXitiLi6pEr9/L9n/0wfazRuhDKXU15kV86N8h8=
github.com/containers/image/v5 v5.4.5-0.20200529084758-46b2ee6aebb0 h1:K1ez+qAi9hCMHv/akPF4ddZumQTq/PBGf2Nzc7e+7lI=
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