]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1d2009c 20e7b4d)
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)
* 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>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.