containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21838 from Luap99/yaml-v3 

vendor update gopkg.in/yaml.v2 to v3
This commit is contained in:
openshift-merge-bot[bot] 2024-02-27 15:08:48 +00:00 committed by GitHub
parent 1303ef4ed7 8d9ff04d10
commit ab2e29fd8f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/podman/machine/info.go
View File

@ -18,7 +18,7 @@ import (
machineDefine "github.com/containers/podman/v5/pkg/machine/define" machineDefine "github.com/containers/podman/v5/pkg/machine/define"
"github.com/containers/podman/v5/pkg/machine/vmconfigs" "github.com/containers/podman/v5/pkg/machine/vmconfigs"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"gopkg.in/yaml.v2" "gopkg.in/yaml.v3"
) )
var infoDescription = `Display information pertaining to the machine host.` var infoDescription = `Display information pertaining to the machine host.`

2
go.mod
View File

@ -77,7 +77,6 @@ require (
golang.org/x/text v0.14.0 golang.org/x/text v0.14.0
google.golang.org/protobuf v1.32.0 google.golang.org/protobuf v1.32.0
gopkg.in/inf.v0 v0.9.1 gopkg.in/inf.v0 v0.9.1
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.1 gopkg.in/yaml.v3 v3.0.1
k8s.io/kubernetes v1.28.4 k8s.io/kubernetes v1.28.4
sigs.k8s.io/yaml v1.4.0 sigs.k8s.io/yaml v1.4.0
@ -222,6 +221,7 @@ require (
gopkg.in/go-jose/go-jose.v2 v2.6.1 // indirect gopkg.in/go-jose/go-jose.v2 v2.6.1 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
tags.cncf.io/container-device-interface/specs-go v0.6.0 // indirect tags.cncf.io/container-device-interface/specs-go v0.6.0 // indirect
) )