diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-06-14 13:13:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-14 13:13:02 -0400 |
| commit | ab4d0cf908e9d24d321b52b419ebfb4ab5802029 (patch) | |
| tree | 6b7fd144a2507e0a9161e11c671aa140f7429bc1 /pkg/api/server | |
| parent | 41fcd4d8ed9225e18f0d0d7c35b1916d14ceaf00 (diff) | |
| parent | 60752b3206c8e950c9ba496917ed39f3cab548d6 (diff) | |
| download | podman-ab4d0cf908e9d24d321b52b419ebfb4ab5802029.tar.gz podman-ab4d0cf908e9d24d321b52b419ebfb4ab5802029.tar.bz2 podman-ab4d0cf908e9d24d321b52b419ebfb4ab5802029.zip | |
Merge pull request #10658 from mheon/bump_321
Bump to v3.2.1
Diffstat (limited to 'pkg/api/server')
| -rw-r--r-- | pkg/api/server/register_containers.go | 2 | ||||
| -rw-r--r-- | pkg/api/server/register_networks.go | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/pkg/api/server/register_containers.go b/pkg/api/server/register_containers.go index 536c4707a..2a6e8e286 100644 --- a/pkg/api/server/register_containers.go +++ b/pkg/api/server/register_containers.go @@ -1359,6 +1359,8 @@ func (s *APIServer) registerContainersHandlers(r *mux.Router) error { // $ref: "#/responses/ok" // 404: // $ref: "#/responses/NoSuchContainer" + // 409: + // $ref: "#/responses/ConflictError" // 500: // $ref: "#/responses/InternalError" r.HandleFunc(VersionedPath("/libpod/containers/{name}/resize"), s.APIHandler(compat.ResizeTTY)).Methods(http.MethodPost) diff --git a/pkg/api/server/register_networks.go b/pkg/api/server/register_networks.go index dcec61bef..85d008e76 100644 --- a/pkg/api/server/register_networks.go +++ b/pkg/api/server/register_networks.go @@ -180,9 +180,12 @@ func (s *APIServer) registerNetworkHandlers(r *mux.Router) error { // 200: // description: OK // schema: - // type: array - // items: - // type: string + // type: object + // properties: + // NetworksDeleted: + // type: array + // items: + // type: string // 500: // $ref: "#/responses/InternalError" r.HandleFunc(VersionedPath("/networks/prune"), s.APIHandler(compat.Prune)).Methods(http.MethodPost) |