From: Kefu Chai <kchai@redhat.com>
Date: Wed, 7 Apr 2021 07:12:24 +0000 (+0800)
Subject: Merge pull request #40604 from liewegas/podman-registries-conf
X-Git-Tag: v17.1.0~2339
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c76940977e2a10adb89d1cb2c828faf61c20ee5c;p=ceph.git

Merge pull request #40604 from liewegas/podman-registries-conf

qa/distros/podman: preserve registries.conf

Reviewed-by: David Galloway <dgallowa@redhat.com>
---

c76940977e2a10adb89d1cb2c828faf61c20ee5c