summaryrefslogtreecommitdiff
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
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
-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 77c22e195..de8323820 100644
--- a/go.mod
+++ b/go.mod
@@ -11,7 +11,7 @@ require (
github.com/containernetworking/plugins v0.8.5
github.com/containers/buildah v1.14.9-0.20200501175434-42a48f9373d9
github.com/containers/common v0.11.2
- github.com/containers/conmon v2.0.14+incompatible
+ github.com/containers/conmon v2.0.16+incompatible
github.com/containers/image/v5 v5.4.4
github.com/containers/psgo v1.5.0
github.com/containers/storage v1.19.1
diff --git a/go.sum b/go.sum
index 588dfef8c..dad83de51 100644
--- a/go.sum
+++ b/go.sum
@@ -74,8 +74,8 @@ github.com/containers/common v0.10.0 h1:Km1foMJJBIxceA1/UCZcIuwf8sCF71sP5DwE6Oh1
github.com/containers/common v0.10.0/go.mod h1:6A/moCuQITXLqBe5A0WKKTcCfCmEQRbknI05HcPzOL0=
github.com/containers/common v0.11.2 h1:e4477fCE3qSA+Z2vT+uUMUTn8s8CyIM++qNm3PCSl68=
github.com/containers/common v0.11.2/go.mod h1:2w3QE6VUmhltGYW4wV00h4okq1Crs7hNI1ZD2I0QRUY=
-github.com/containers/conmon v2.0.14+incompatible h1:knU1O1QxXy5YxtjMQVKEyCajROaehizK9FHaICl+P5Y=
-github.com/containers/conmon v2.0.14+incompatible/go.mod h1:hgwZ2mtuDrppv78a/cOBNiCm6O0UMWGx1mu7P00nu5I=
+github.com/containers/conmon v2.0.16+incompatible h1:QFOlb9Id4WoJ24BelCFWwDSPTquwKMp3L3g2iGmRTq4=
+github.com/containers/conmon v2.0.16+incompatible/go.mod h1:hgwZ2mtuDrppv78a/cOBNiCm6O0UMWGx1mu7P00nu5I=
github.com/containers/image/v5 v5.4.3 h1:zn2HR7uu4hpvT5QQHgjqonOzKDuM1I1UHUEmzZT5sbs=
github.com/containers/image/v5 v5.4.3/go.mod h1:pN0tvp3YbDd7BWavK2aE0mvJUqVd2HmhPjekyWSFm0U=
github.com/containers/image/v5 v5.4.4 h1:JSanNn3v/BMd3o0MEvO4R4OKNuoJUSzVGQAI1+0FMXE=
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