summaryrefslogtreecommitdiff
path: root/cmd/podman/varlink/io.podman.varlink
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-12-07 09:06:03 -0800
committerGitHub <noreply@github.com>2018-12-07 09:06:03 -0800
commit5073638d83b4f466fda434e6a06ad8bab9eef321 (patch)
treed33bd9755a879f27b446c9eb2a80613894cbaff7 /cmd/podman/varlink/io.podman.varlink
parentd266460f7bdd8d49835c8228fe16706915f92796 (diff)
parent52098941000794180a358a6983237cc6c4d30fc1 (diff)
downloadpodman-5073638d83b4f466fda434e6a06ad8bab9eef321.tar.gz
podman-5073638d83b4f466fda434e6a06ad8bab9eef321.tar.bz2
podman-5073638d83b4f466fda434e6a06ad8bab9eef321.zip
Merge pull request #1953 from baude/podstoptimeout
add timeout to pod stop
Diffstat (limited to 'cmd/podman/varlink/io.podman.varlink')
-rw-r--r--cmd/podman/varlink/io.podman.varlink4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/podman/varlink/io.podman.varlink b/cmd/podman/varlink/io.podman.varlink
index 486f4e60c..3cdc99a83 100644
--- a/cmd/podman/varlink/io.podman.varlink
+++ b/cmd/podman/varlink/io.podman.varlink
@@ -715,7 +715,7 @@ method InspectPod(name: string) -> (pod: string)
# ~~~
method StartPod(name: string) -> (pod: string)
-# StopPod stops containers in a pod. It takes the name or ID of a pod.
+# StopPod stops containers in a pod. It takes the name or ID of a pod and a timeout.
# If the pod cannot be found, a [PodNotFound](#PodNotFound) error will be returned instead.
# Containers in a pod are stopped independently. If there is an error stopping one container, the ID of those containers
# will be returned in a list, along with the ID of the pod in a [PodContainerError](#PodContainerError).
@@ -728,7 +728,7 @@ method StartPod(name: string) -> (pod: string)
# "pod": "135d71b9495f7c3967f536edad57750bfdb569336cd107d8aabab45565ffcfb6"
# }
# ~~~
-method StopPod(name: string) -> (pod: string)
+method StopPod(name: string, timeout: int) -> (pod: string)
# RestartPod will restart containers in a pod given a pod name or ID. Containers in
# the pod that are running will be stopped, then all stopped containers will be run.