diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-03-31 16:30:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-31 16:30:34 +0200 |
| commit | 7d4ab3fd8f48c7ded1a226f148e3677a1122c657 (patch) | |
| tree | c69100edf52888f2927fc0a126615bffa3b46a0b | |
| parent | 9b86835c3976dbe81807f22d31a6d993b0ec9dd5 (diff) | |
| parent | 3838bb0062d90eb39a19924abb643169ce70e2c0 (diff) | |
| download | podman-7d4ab3fd8f48c7ded1a226f148e3677a1122c657.tar.gz podman-7d4ab3fd8f48c7ded1a226f148e3677a1122c657.tar.bz2 podman-7d4ab3fd8f48c7ded1a226f148e3677a1122c657.zip | |
Merge pull request #5518 from containers/dependabot/go_modules/github.com/containers/conmon-2.0.12incompatible
Bump github.com/containers/conmon from 2.0.10+incompatible to 2.0.14
| -rw-r--r-- | go.mod | 2 | ||||
| -rw-r--r-- | go.sum | 4 | ||||
| -rw-r--r-- | vendor/modules.txt | 2 |
3 files changed, 4 insertions, 4 deletions
@@ -11,7 +11,7 @@ require ( github.com/containernetworking/plugins v0.8.5 github.com/containers/buildah v1.14.5 github.com/containers/common v0.6.1 - github.com/containers/conmon v2.0.10+incompatible + github.com/containers/conmon v2.0.14+incompatible github.com/containers/image/v5 v5.3.1 github.com/containers/psgo v1.4.0 github.com/containers/storage v1.16.6 @@ -66,8 +66,8 @@ github.com/containers/buildah v1.14.5 h1:0Q+UgkIG4gAgAEZCu+0Syu/fSKsM1EsrctwV8G2 github.com/containers/buildah v1.14.5/go.mod h1:2rfICEnpTtrMhWF6FZLnAL1Bh7SNmjhiKrjuIo0ZuN8= github.com/containers/common v0.6.1 h1:z9VeVXYeOnNV99uNLp7zoE5KO1n0hqz1mdm5a6AiIrA= github.com/containers/common v0.6.1/go.mod h1:m62kenckrWi5rZx32kaLje2Og0hpf6NsaTBn6+b+Oys= -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/conmon v2.0.14+incompatible h1:knU1O1QxXy5YxtjMQVKEyCajROaehizK9FHaICl+P5Y= +github.com/containers/conmon v2.0.14+incompatible/go.mod h1:hgwZ2mtuDrppv78a/cOBNiCm6O0UMWGx1mu7P00nu5I= github.com/containers/image/v5 v5.2.1/go.mod h1:TfhmLwH+v1/HBVPIWH7diLs8XwcOkP3c7t7JFgqaUEc= github.com/containers/image/v5 v5.3.1 h1:AL0pR0d1ho3kLUAuBr+wnFlXuD3ChzKVljk0M8JBJHQ= github.com/containers/image/v5 v5.3.1/go.mod h1:JnCfhbTIL9IxPPZm1JoQwiE0S9KET46M4OZySJsLylk= diff --git a/vendor/modules.txt b/vendor/modules.txt index 40bc53872..a1c28b023 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -86,7 +86,7 @@ github.com/containers/buildah/util github.com/containers/common/pkg/capabilities github.com/containers/common/pkg/config github.com/containers/common/pkg/unshare -# github.com/containers/conmon v2.0.10+incompatible +# github.com/containers/conmon v2.0.14+incompatible github.com/containers/conmon/runner/config # github.com/containers/image/v5 v5.3.1 github.com/containers/image/v5/copy |