]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #40729 into pacific
authorSage Weil <sage@newdream.net>
Wed, 12 May 2021 12:07:53 +0000 (07:07 -0500)
committerSage Weil <sage@newdream.net>
Wed, 12 May 2021 12:07:53 +0000 (07:07 -0500)
* refs/pull/40729/head:
qa/distros/podman: preserve registries.conf

Reviewed-by: Kefu Chai <kchai@redhat.com>

Trivial merge