From: Sage Weil <sage@redhat.com>
Date: Tue, 3 Mar 2020 15:05:12 +0000 (-0600)
Subject: Merge PR #33679 into master
X-Git-Tag: v15.1.1~152
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e7a4c8f1a5a7bf66bf87d7487cadf3dab2a22780;p=ceph.git

Merge PR #33679 into master

* refs/pull/33679/head:
	cephadm: fix failure when getting keyring for deploying daemons

Reviewed-by: Sage Weil <sage@redhat.com>
---

e7a4c8f1a5a7bf66bf87d7487cadf3dab2a22780