diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-08-28 08:23:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-28 08:23:59 -0400 |
| commit | 74bdf52c401dd1c9cd3c636d4fa8ea94e7c88ef3 (patch) | |
| tree | af0904e9ec643dea2caa8d39a55764adc38c069f /vendor/k8s.io/apimachinery/pkg/runtime/converter.go | |
| parent | 061c93f70101026d79cca6e75ac0c565e1fa99ec (diff) | |
| parent | 90a86cad3a6f007c6708406d8a78528fbb302a0a (diff) | |
| download | podman-74bdf52c401dd1c9cd3c636d4fa8ea94e7c88ef3.tar.gz podman-74bdf52c401dd1c9cd3c636d4fa8ea94e7c88ef3.tar.bz2 podman-74bdf52c401dd1c9cd3c636d4fa8ea94e7c88ef3.zip | |
Merge pull request #7472 from containers/dependabot/go_modules/k8s.io/apimachinery-0.19.0
Bump k8s.io/apimachinery from 0.18.8 to 0.19.0
Diffstat (limited to 'vendor/k8s.io/apimachinery/pkg/runtime/converter.go')
| -rw-r--r-- | vendor/k8s.io/apimachinery/pkg/runtime/converter.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vendor/k8s.io/apimachinery/pkg/runtime/converter.go b/vendor/k8s.io/apimachinery/pkg/runtime/converter.go index 918d0831d..871e4c8c4 100644 --- a/vendor/k8s.io/apimachinery/pkg/runtime/converter.go +++ b/vendor/k8s.io/apimachinery/pkg/runtime/converter.go @@ -31,9 +31,9 @@ import ( "k8s.io/apimachinery/pkg/conversion" "k8s.io/apimachinery/pkg/util/json" utilruntime "k8s.io/apimachinery/pkg/util/runtime" - "sigs.k8s.io/structured-merge-diff/v3/value" + "sigs.k8s.io/structured-merge-diff/v4/value" - "k8s.io/klog" + "k8s.io/klog/v2" ) // UnstructuredConverter is an interface for converting between interface{} |