diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-07-02 08:33:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-02 08:33:02 -0400 |
| commit | 04209873562dff25c5d6f800e4a535dff18d485a (patch) | |
| tree | 67f0ee2916812072967707ae6de779ebbcdb0476 /go.mod | |
| parent | 955c1d2bfeac0c399bbc4d82fd7b72ed4cc868d3 (diff) | |
| parent | 735be12481cdc3edfcbca3500172d2164255e1a3 (diff) | |
| download | podman-04209873562dff25c5d6f800e4a535dff18d485a.tar.gz podman-04209873562dff25c5d6f800e4a535dff18d485a.tar.bz2 podman-04209873562dff25c5d6f800e4a535dff18d485a.zip | |
Merge pull request #10844 from vrothberg/vendor-common
vendor containers/common@main
Diffstat (limited to 'go.mod')
| -rw-r--r-- | go.mod | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -12,7 +12,7 @@ require ( github.com/containernetworking/cni v0.8.1 github.com/containernetworking/plugins v0.9.1 github.com/containers/buildah v1.21.1-0.20210628174543-eadb10a12336 - github.com/containers/common v0.40.2-0.20210630092122-7482cf851dcc + github.com/containers/common v0.40.2-0.20210702074932-9d34b37ba77e github.com/containers/conmon v2.0.20+incompatible github.com/containers/image/v5 v5.13.2 github.com/containers/ocicrypt v1.1.2 @@ -54,7 +54,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 github.com/rootless-containers/rootlesskit v0.14.2 github.com/sirupsen/logrus v1.8.1 - github.com/spf13/cobra v1.1.3 + github.com/spf13/cobra v1.2.0 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.7.0 github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 @@ -63,9 +63,11 @@ require ( github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852 go.etcd.io/bbolt v1.3.6 golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 - golang.org/x/sync v0.0.0-20201207232520-09787c993a3a + golang.org/x/sync v0.0.0-20210220032951-036812b2e83c golang.org/x/sys v0.0.0-20210603125802-9665404d3644 - gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 + gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b k8s.io/api v0.21.2 k8s.io/apimachinery v0.21.2 ) + +replace github.com/spf13/cobra => github.com/spf13/cobra v1.1.3 |