summaryrefslogtreecommitdiff
path: root/cni
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-12-27 14:44:59 +0100
committerGitHub <noreply@github.com>2019-12-27 14:44:59 +0100
commit55922e36707347d5db7182cda3d820e4bd85968d (patch)
tree5dd5aa1f2d1ac038d28ad6261640436c1e461462 /cni
parentc759c3f78dcbbf5dec462a863ad25cd41a1707b7 (diff)
parent25860df8785c6d51ced8320ec6d0d9620171bdb9 (diff)
downloadpodman-55922e36707347d5db7182cda3d820e4bd85968d.tar.gz
podman-55922e36707347d5db7182cda3d820e4bd85968d.tar.bz2
podman-55922e36707347d5db7182cda3d820e4bd85968d.zip
Merge pull request #4751 from mheon/quiet_template_noconflict
The --quiet flag does not conflict with templates in ps
Diffstat (limited to 'cni')
0 files changed, 0 insertions, 0 deletions