diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-05-07 10:21:27 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-07 10:21:27 -0400 |
commit | aa5cd674aec28ecf207d6982797b1bb000a2b322 (patch) | |
tree | b51fc4ce00b65f34c5c0fe129b50a0a71be645df /vendor/modules.txt | |
parent | b533fcb12eecc5206a0cb3e93fed1abc2f3abf3b (diff) | |
parent | a3fb15dffb1ce9c4c2dacceaa1e535ada4819060 (diff) | |
download | podman-aa5cd674aec28ecf207d6982797b1bb000a2b322.tar.gz podman-aa5cd674aec28ecf207d6982797b1bb000a2b322.tar.bz2 podman-aa5cd674aec28ecf207d6982797b1bb000a2b322.zip |
Merge pull request #10257 from containers/dependabot/go_modules/github.com/docker/docker-20.10.6incompatible
Bump github.com/docker/docker from 20.10.3-0.20210216175712-646072ed6524+incompatible to 20.10.6+incompatible
Diffstat (limited to 'vendor/modules.txt')
-rw-r--r-- | vendor/modules.txt | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/vendor/modules.txt b/vendor/modules.txt index 91c62fbf2..c706ee16e 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -59,9 +59,6 @@ github.com/containerd/containerd/errdefs github.com/containerd/containerd/log github.com/containerd/containerd/platforms github.com/containerd/containerd/sys -# github.com/containerd/continuity v0.0.0-20210208174643-50096c924a4e -github.com/containerd/continuity/fs -github.com/containerd/continuity/sysx # github.com/containernetworking/cni v0.8.1 github.com/containernetworking/cni/libcni github.com/containernetworking/cni/pkg/invoke @@ -279,7 +276,7 @@ github.com/docker/distribution/registry/client/auth/challenge github.com/docker/distribution/registry/client/transport github.com/docker/distribution/registry/storage/cache github.com/docker/distribution/registry/storage/cache/memory -# github.com/docker/docker v20.10.3-0.20210216175712-646072ed6524+incompatible +# github.com/docker/docker v20.10.6+incompatible github.com/docker/docker/api github.com/docker/docker/api/types github.com/docker/docker/api/types/blkiodev @@ -665,7 +662,6 @@ golang.org/x/net/internal/timeseries golang.org/x/net/proxy golang.org/x/net/trace # golang.org/x/sync v0.0.0-20201207232520-09787c993a3a -golang.org/x/sync/errgroup golang.org/x/sync/semaphore # golang.org/x/sys v0.0.0-20210423082822-04245dca01da golang.org/x/sys/cpu |