diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-06-10 07:52:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-10 07:52:46 -0400 |
| commit | efc1936c7c591cb3b552246ff4687c8631456168 (patch) | |
| tree | 057d0f294bf22414526a033b48af2fa41edb93a2 /go.mod | |
| parent | 9f1bd0a0a1494f46a49ca7f22511c5a78006afd8 (diff) | |
| parent | d4272bed51e2060d431ad042e803770e4d2fe64e (diff) | |
| download | podman-efc1936c7c591cb3b552246ff4687c8631456168.tar.gz podman-efc1936c7c591cb3b552246ff4687c8631456168.tar.bz2 podman-efc1936c7c591cb3b552246ff4687c8631456168.zip | |
Merge pull request #14526 from vrothberg/fix-14420
podman cp: do not overwrite non-dirs with dirs and vice versa
Diffstat (limited to 'go.mod')
| -rw-r--r-- | go.mod | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -11,7 +11,7 @@ require ( github.com/container-orchestrated-devices/container-device-interface v0.4.0 github.com/containernetworking/cni v1.1.1 github.com/containernetworking/plugins v1.1.1 - github.com/containers/buildah v1.26.1-0.20220524184833-5500333c2e06 + github.com/containers/buildah v1.26.1-0.20220607182634-005447be07ee github.com/containers/common v0.48.1-0.20220528105338-54c8092c69a1 github.com/containers/conmon v2.0.20+incompatible github.com/containers/image/v5 v5.21.2-0.20220520105616-e594853d6471 @@ -67,7 +67,7 @@ require ( golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a - golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 + golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 golang.org/x/text v0.3.7 google.golang.org/protobuf v1.28.0 gopkg.in/inf.v0 v0.9.1 |