diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-03-15 12:19:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-15 12:19:57 -0400 |
| commit | 4e2334c1493a03dc26b89cb00b321b268c3ca9ea (patch) | |
| tree | b3bca69b08bc22aac4211e20f475aa0075f444a8 /vendor | |
| parent | ac6ef74937b442833b9c030a652856b4b50ad9aa (diff) | |
| parent | 439323cd2e601056625c7ad1d949e83db5894721 (diff) | |
| download | podman-4e2334c1493a03dc26b89cb00b321b268c3ca9ea.tar.gz podman-4e2334c1493a03dc26b89cb00b321b268c3ca9ea.tar.bz2 podman-4e2334c1493a03dc26b89cb00b321b268c3ca9ea.zip | |
Merge pull request #13512 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 cdf4067b8..8a464066a 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -326,7 +326,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 |