]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
Merge PR #39677 into master
authorSage Weil <sage@newdream.net>
Thu, 11 Mar 2021 00:24:30 +0000 (19:24 -0500)
committerSage Weil <sage@newdream.net>
Thu, 11 Mar 2021 00:24:30 +0000 (19:24 -0500)
commit99971f7f558c76ed4965769f2a121db68b05567a
treea5529796cff4f1c7b42eb3c2511b247a3c4b74c2
parent1d2009c3e904747260641a92235962d26057b910
parent20e7b4d5aaaf60442f5600dc914080b3c9615795
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>