diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-05-08 12:59:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-08 12:59:42 +0200 |
| commit | 4b300a12cedabff3c57ee657afac0696cefaae0a (patch) | |
| tree | 61c5fceec50e88338038415fa1375371bef2dca4 /vendor/modules.txt | |
| parent | 70e7fc670be13d3877e65e160456c312e23a5806 (diff) | |
| parent | 2f0bc5ff1cde9afb595868b92dd123478af9ef74 (diff) | |
| download | podman-4b300a12cedabff3c57ee657afac0696cefaae0a.tar.gz podman-4b300a12cedabff3c57ee657afac0696cefaae0a.tar.bz2 podman-4b300a12cedabff3c57ee657afac0696cefaae0a.zip | |
Merge pull request #6086 from containers/dependabot/go_modules/k8s.io/api-0.18.2
Bump k8s.io/api from 0.17.4 to 0.18.2
Diffstat (limited to 'vendor/modules.txt')
| -rw-r--r-- | vendor/modules.txt | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/vendor/modules.txt b/vendor/modules.txt index 04d961103..da97b24fe 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -291,7 +291,7 @@ github.com/golang/protobuf/ptypes github.com/golang/protobuf/ptypes/any github.com/golang/protobuf/ptypes/duration github.com/golang/protobuf/ptypes/timestamp -# github.com/google/gofuzz v1.0.0 +# github.com/google/gofuzz v1.1.0 github.com/google/gofuzz # github.com/google/shlex v0.0.0-20181106134648-c34317bd91bf github.com/google/shlex @@ -641,9 +641,9 @@ gopkg.in/square/go-jose.v2/json gopkg.in/tomb.v1 # gopkg.in/yaml.v2 v2.2.8 gopkg.in/yaml.v2 -# k8s.io/api v0.17.4 +# k8s.io/api v0.18.2 k8s.io/api/core/v1 -# k8s.io/apimachinery v0.17.4 +# k8s.io/apimachinery v0.18.2 k8s.io/apimachinery/pkg/api/errors k8s.io/apimachinery/pkg/api/resource k8s.io/apimachinery/pkg/apis/meta/v1 @@ -704,5 +704,7 @@ k8s.io/client-go/util/keyutil k8s.io/klog # k8s.io/utils v0.0.0-20190221042446-c2654d5206da k8s.io/utils/integer -# sigs.k8s.io/yaml v1.1.0 +# sigs.k8s.io/structured-merge-diff/v3 v3.0.0 +sigs.k8s.io/structured-merge-diff/v3/value +# sigs.k8s.io/yaml v1.2.0 sigs.k8s.io/yaml |