diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-02-19 17:30:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-19 17:30:21 +0100 |
| commit | da249e2fe279659458abb6bee995e68813849f00 (patch) | |
| tree | a3d9da4fc713adeacbb005caea1eb3d5ff3e969c /docs | |
| parent | 7efcca2818178fd815f234f8be66aca5dc5a676f (diff) | |
| parent | 0fcaa935733d3cdacd0e462d060a984e8e1218ce (diff) | |
| download | podman-da249e2fe279659458abb6bee995e68813849f00.tar.gz podman-da249e2fe279659458abb6bee995e68813849f00.tar.bz2 podman-da249e2fe279659458abb6bee995e68813849f00.zip | |
Merge pull request #5225 from vrothberg/fix-5087
config: use built-in TOML merge and adhere to label setting
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/source/markdown/libpod.conf.5.md | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/source/markdown/libpod.conf.5.md b/docs/source/markdown/libpod.conf.5.md index c28c80b56..ca45bccf6 100644 --- a/docs/source/markdown/libpod.conf.5.md +++ b/docs/source/markdown/libpod.conf.5.md @@ -83,7 +83,8 @@ libpod to manage containers. containers and pods are visible. **label**="true|false" - Indicates whether the containers should use label separation. + Indicates whether the containers should use label separation by default. + Can be overridden via `--security-opt label=...` on the CLI. **num_locks**="" Number of locks available for containers and pods. Each created container or pod consumes one lock. |