diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-03-27 00:05:47 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-27 00:05:47 +0000 |
| commit | 4d0b583340c37efbf175c00d75d75107a0b23f00 (patch) | |
| tree | 54f82597112522b14633bdf44aec412747aaf9ee /pkg/api/server | |
| parent | f3024b906ce717f7858c138a9c1daf72bdb8d132 (diff) | |
| parent | dcabf6dd717ad495ba71d2788a64255defb852fd (diff) | |
| download | podman-4d0b583340c37efbf175c00d75d75107a0b23f00.tar.gz podman-4d0b583340c37efbf175c00d75d75107a0b23f00.tar.bz2 podman-4d0b583340c37efbf175c00d75d75107a0b23f00.zip | |
Merge pull request #9833 from rhatdan/resize
Remove resize race condition
Diffstat (limited to 'pkg/api/server')
| -rw-r--r-- | pkg/api/server/register_containers.go | 5 | ||||
| -rw-r--r-- | pkg/api/server/register_exec.go | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/pkg/api/server/register_containers.go b/pkg/api/server/register_containers.go index 31196aa9e..b379d52ce 100644 --- a/pkg/api/server/register_containers.go +++ b/pkg/api/server/register_containers.go @@ -587,6 +587,11 @@ func (s *APIServer) registerContainersHandlers(r *mux.Router) error { // type: integer // required: false // description: Width to set for the terminal, in characters + // - in: query + // name: running + // type: boolean + // required: false + // description: Ignore containers not running errors // produces: // - application/json // responses: diff --git a/pkg/api/server/register_exec.go b/pkg/api/server/register_exec.go index 0f8c827c8..de437ab1a 100644 --- a/pkg/api/server/register_exec.go +++ b/pkg/api/server/register_exec.go @@ -136,6 +136,11 @@ func (s *APIServer) registerExecHandlers(r *mux.Router) error { // name: w // type: integer // description: Width of the TTY session in characters + // - in: query + // name: running + // type: boolean + // required: false + // description: Ignore containers not running errors // produces: // - application/json // responses: |