summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-03-29 15:10:04 -0700
committerGitHub <noreply@github.com>2019-03-29 15:10:04 -0700
commite43593154452dacd98bf6eb68e650ce8c7f1e3a7 (patch)
tree257bf2aaa1107c50a7c99ddb40e048bc8f8cd437
parentc5ccab2dc4dc582e41aa81cddb7eb761715978b5 (diff)
parent99318b08946b79326006d4661367812bcc838c80 (diff)
downloadpodman-e43593154452dacd98bf6eb68e650ce8c7f1e3a7.tar.gz
podman-e43593154452dacd98bf6eb68e650ce8c7f1e3a7.tar.bz2
podman-e43593154452dacd98bf6eb68e650ce8c7f1e3a7.zip
Merge pull request #2801 from mheon/remove_wait_event
Remove wait event
-rw-r--r--docs/podman-events.1.md1
-rw-r--r--libpod/container_api.go1
-rw-r--r--libpod/events/events.go4
3 files changed, 0 insertions, 6 deletions
diff --git a/docs/podman-events.1.md b/docs/podman-events.1.md
index 3463d2aaa..40f7e8457 100644
--- a/docs/podman-events.1.md
+++ b/docs/podman-events.1.md
@@ -32,7 +32,6 @@ The *container* event type will report the follow statuses:
* sync
* unmount
* unpause
- * wait
The *pod* event type will report the follow statuses:
* create
diff --git a/libpod/container_api.go b/libpod/container_api.go
index 96435c2ff..2a2381923 100644
--- a/libpod/container_api.go
+++ b/libpod/container_api.go
@@ -574,7 +574,6 @@ func (c *Container) WaitWithInterval(waitTimeout time.Duration) (int32, error) {
return 0, err
}
exitCode := c.state.ExitCode
- c.newContainerEvent(events.Wait)
return exitCode, nil
}
diff --git a/libpod/events/events.go b/libpod/events/events.go
index fad129eff..074a3ba5b 100644
--- a/libpod/events/events.go
+++ b/libpod/events/events.go
@@ -105,8 +105,6 @@ const (
Unpause Status = "unpause"
// Untag ...
Untag Status = "untag"
- // Wait ...
- Wait Status = "wait"
)
// EventFilter for filtering events
@@ -269,8 +267,6 @@ func StringToStatus(name string) (Status, error) {
return Unpause, nil
case Untag.String():
return Untag, nil
- case Wait.String():
- return Wait, nil
}
return "", errors.Errorf("unknown event status %s", name)
}