diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-08-02 03:44:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-02 03:44:43 +0200 |
| commit | e3240daa471dee1bbc118e6b3871c4a73890d0e0 (patch) | |
| tree | 402bfadad932067a96635f799d3c3fd98282d5b2 /docs | |
| parent | e48dc506d18335b36d1ffbbc8df1890ee3b99e2c (diff) | |
| parent | 8da24f2f7d3472d2be4ccde8e7b42790671d464f (diff) | |
| download | podman-e3240daa471dee1bbc118e6b3871c4a73890d0e0.tar.gz podman-e3240daa471dee1bbc118e6b3871c4a73890d0e0.tar.bz2 podman-e3240daa471dee1bbc118e6b3871c4a73890d0e0.zip | |
Merge pull request #3551 from mheon/fix_memory_leak
Fix memory leak with exit files
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/libpod.conf.5.md | 2 | ||||
| -rw-r--r-- | docs/podman.1.md | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/docs/libpod.conf.5.md b/docs/libpod.conf.5.md index b4d562d94..c28c80b56 100644 --- a/docs/libpod.conf.5.md +++ b/docs/libpod.conf.5.md @@ -99,7 +99,7 @@ libpod to manage containers. a slirp4netns network. If "" is used then the binary is looked up using the $PATH environment variable. **events_logger**="" - Default method to use when logging events. Valid values are "journald" and "file". + Default method to use when logging events. Valid values are "file", "journald", and "none". **detach_keys**="" Keys sequence used for detaching a container diff --git a/docs/podman.1.md b/docs/podman.1.md index 022514a80..bfb5a9aec 100644 --- a/docs/podman.1.md +++ b/docs/podman.1.md @@ -36,6 +36,10 @@ Note: CGroup manager is not supported in rootless mode when using CGroups Versio Path to where the cpu performance results should be written +**--events-logger**=*type* + +Backend to use for storing events. Allowed values are **file**, **journald**, and **none**. + **--hooks-dir**=*path* Each `*.json` file in the path configures a hook for Podman containers. For more details on the syntax of the JSON files and the semantics of hook injection, see `oci-hooks(5)`. Podman and libpod currently support both the 1.0.0 and 0.1.0 hook schemas, although the 0.1.0 schema is deprecated. |