diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-02-17 14:26:39 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-17 14:26:39 -0500 |
| commit | 93e8c39834edd08c502d18c3d0b96948ec865a37 (patch) | |
| tree | 4acd6685d8525aa0177f5f819a8d841337ed01ad /pkg/api | |
| parent | a34f27959a6125dc3e27d962cf0ec8715c30eb3b (diff) | |
| parent | d59749d64dc0d86a06b953b8fe41bb6d102b8556 (diff) | |
| download | podman-93e8c39834edd08c502d18c3d0b96948ec865a37.tar.gz podman-93e8c39834edd08c502d18c3d0b96948ec865a37.tar.bz2 podman-93e8c39834edd08c502d18c3d0b96948ec865a37.zip | |
Merge pull request #13255 from mheon/bump_400_final
Bump to v4.0.0 final
Diffstat (limited to 'pkg/api')
| -rw-r--r-- | pkg/api/handlers/libpod/manifests.go | 2 | ||||
| -rw-r--r-- | pkg/api/server/register_networks.go | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/pkg/api/handlers/libpod/manifests.go b/pkg/api/handlers/libpod/manifests.go index 250736579..ad662f32c 100644 --- a/pkg/api/handlers/libpod/manifests.go +++ b/pkg/api/handlers/libpod/manifests.go @@ -401,7 +401,7 @@ func ManifestModify(w http.ResponseWriter, r *http.Request) { case len(report.Errors) > 0 && len(report.Images) > 0: statusCode = http.StatusConflict case len(report.Errors) > 0: - statusCode = http.StatusInternalServerError + statusCode = http.StatusBadRequest } utils.WriteResponse(w, statusCode, report) } diff --git a/pkg/api/server/register_networks.go b/pkg/api/server/register_networks.go index baa1fe6fb..4466c938f 100644 --- a/pkg/api/server/register_networks.go +++ b/pkg/api/server/register_networks.go @@ -320,6 +320,8 @@ func (s *APIServer) registerNetworkHandlers(r *mux.Router) error { // $ref: "#/responses/NetworkCreateReport" // 400: // $ref: "#/responses/BadParamError" + // 409: + // $ref: "#/responses/ConflictError" // 500: // $ref: "#/responses/InternalError" r.HandleFunc(VersionedPath("/libpod/networks/create"), s.APIHandler(libpod.CreateNetwork)).Methods(http.MethodPost) |