From: Sage Weil <sage@newdream.net>
Date: Mon, 15 Mar 2021 20:10:34 +0000 (-0400)
Subject: Merge PR #40071 into master
X-Git-Tag: v17.1.0~2610
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=52c016aa02a3608a428898a8de03ea347f9d0d5f;p=ceph.git

Merge PR #40071 into master

* refs/pull/40071/head:
	mgr/cephadm: tolerate failure to update daemon caps
	mgr/cephadm: fix get_keyring_with_caps

Reviewed-by: Adam King <adking@redhat.com>
---

52c016aa02a3608a428898a8de03ea347f9d0d5f