diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-03-11 09:26:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-11 09:26:37 -0500 |
| commit | 7ab85b322b3492eae09dd04cdec2e538cd18ae03 (patch) | |
| tree | 80a819809853d316c71910628fd07716ce2f4303 /vendor | |
| parent | 7ba81ead38d0c4fb2e583224257a0497789552fc (diff) | |
| parent | 4ab24a068163bd3a72f9b7768f45749cbfd53ed7 (diff) | |
| download | podman-7ab85b322b3492eae09dd04cdec2e538cd18ae03.tar.gz podman-7ab85b322b3492eae09dd04cdec2e538cd18ae03.tar.bz2 podman-7ab85b322b3492eae09dd04cdec2e538cd18ae03.zip | |
Merge pull request #13484 from containers/dependabot/go_modules/github.com/docker/docker-20.10.13incompatible
Bump github.com/docker/docker from 20.10.12+incompatible to 20.10.13+incompatible
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/github.com/docker/docker/api/swagger.yaml | 11 | ||||
| -rw-r--r-- | vendor/modules.txt | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/vendor/github.com/docker/docker/api/swagger.yaml b/vendor/github.com/docker/docker/api/swagger.yaml index bada4a8e3..b6bca4cef 100644 --- a/vendor/github.com/docker/docker/api/swagger.yaml +++ b/vendor/github.com/docker/docker/api/swagger.yaml @@ -5755,7 +5755,6 @@ paths: property1: "string" property2: "string" IpcMode: "" - LxcConf: [] Memory: 0 MemorySwap: 0 MemoryReservation: 0 @@ -8607,12 +8606,20 @@ paths: if `tty` was specified as part of creating and starting the exec instance. operationId: "ExecResize" responses: - 201: + 200: description: "No error" + 400: + description: "bad parameter" + schema: + $ref: "#/definitions/ErrorResponse" 404: description: "No such exec instance" schema: $ref: "#/definitions/ErrorResponse" + 500: + description: "Server error" + schema: + $ref: "#/definitions/ErrorResponse" parameters: - name: "id" in: "path" diff --git a/vendor/modules.txt b/vendor/modules.txt index 0b3b4c089..19f312dbb 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -325,7 +325,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.12+incompatible +# github.com/docker/docker v20.10.13+incompatible ## explicit github.com/docker/docker/api github.com/docker/docker/api/types |