From: Sage Weil <sage@newdream.net>
Date: Thu, 11 Mar 2021 00:24:30 +0000 (-0500)
Subject: Merge PR #39677 into master
X-Git-Tag: v17.1.0~2659
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=99971f7f558c76ed4965769f2a121db68b05567a;p=ceph.git

Merge PR #39677 into master

* refs/pull/39677/head:
	mgr/cephadm: add iscsi and nfs to upgrade
	mgr/cephadm: update caps if necessary when getting keyring

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
---

99971f7f558c76ed4965769f2a121db68b05567a