summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-01-23 06:15:24 -0800
committerGitHub <noreply@github.com>2020-01-23 06:15:24 -0800
commit2321a49195bc1ba7922614098bbb97096f04ebde (patch)
tree2930b55f0a8266d538d4797d23150f65f2c59d51
parentf037f24b67c4fd95c9b85ecf40a7ba6d9c7dd7f6 (diff)
parent8151d7ae90dd2db8f9c358e3e90518281099bb71 (diff)
downloadpodman-2321a49195bc1ba7922614098bbb97096f04ebde.tar.gz
podman-2321a49195bc1ba7922614098bbb97096f04ebde.tar.bz2
podman-2321a49195bc1ba7922614098bbb97096f04ebde.zip
Merge pull request #4949 from containers/dependabot/go_modules/github.com/containers/conmon-2.0.10+incompatible
build(deps): bump github.com/containers/conmon from 2.0.9+incompatible to 2.0.10+incompatible
-rw-r--r--go.mod2
-rw-r--r--go.sum2
-rw-r--r--vendor/modules.txt2
3 files changed, 4 insertions, 2 deletions
diff --git a/go.mod b/go.mod
index 3a435ce0e..58aa30b5a 100644
--- a/go.mod
+++ b/go.mod
@@ -11,7 +11,7 @@ require (
github.com/containernetworking/cni v0.7.2-0.20190904153231-83439463f784
github.com/containernetworking/plugins v0.8.5
github.com/containers/buildah v1.13.1
- github.com/containers/conmon v2.0.9+incompatible
+ github.com/containers/conmon v2.0.10+incompatible
github.com/containers/image/v5 v5.1.0
github.com/containers/psgo v1.4.0
github.com/containers/storage v1.15.7
diff --git a/go.sum b/go.sum
index 2c198ab73..ff350fa1f 100644
--- a/go.sum
+++ b/go.sum
@@ -85,6 +85,8 @@ github.com/containers/common v0.0.7 h1:eKYZLKfJ2d/RNDgecLDFv45cHb4imYzIcrQHx1Y02
github.com/containers/common v0.0.7/go.mod h1:lhWV3MLhO1+KGE2x6v9+K38MxpjXGso+edmpkFnCOqI=
github.com/containers/conmon v2.0.9+incompatible h1:YcEgk0Ny1WBdH35M2LKe2cG6FiQqzDdVaURw84XvS7A=
github.com/containers/conmon v2.0.9+incompatible/go.mod h1:hgwZ2mtuDrppv78a/cOBNiCm6O0UMWGx1mu7P00nu5I=
+github.com/containers/conmon v2.0.10+incompatible h1:EiwL41r5vx8SxG+dyUmbJ3baV9GUWjijPOdCkzM6gWU=
+github.com/containers/conmon v2.0.10+incompatible/go.mod h1:hgwZ2mtuDrppv78a/cOBNiCm6O0UMWGx1mu7P00nu5I=
github.com/containers/image/v5 v5.0.0 h1:arnXgbt1ucsC/ndtSpiQY87rA0UjhF+/xQnPzqdBDn4=
github.com/containers/image/v5 v5.0.0/go.mod h1:MgiLzCfIeo8lrHi+4Lb8HP+rh513sm0Mlk6RrhjFOLY=
github.com/containers/image/v5 v5.1.0 h1:5FjAvPJniamuNNIQHkh4PnsL+n+xzs6Aonzaz5dqTEo=
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 3396190dc..2aa86270a 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -78,7 +78,7 @@ github.com/containers/buildah/util
# github.com/containers/common v0.0.7
github.com/containers/common/pkg/cgroups
github.com/containers/common/pkg/unshare
-# github.com/containers/conmon v2.0.9+incompatible
+# github.com/containers/conmon v2.0.10+incompatible
github.com/containers/conmon/runner/config
# github.com/containers/image/v5 v5.1.0
github.com/containers/image/v5/copy