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 /libpod/container.go | |
| 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 'libpod/container.go')
0 files changed, 0 insertions, 0 deletions