]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #40071 into master
authorSage Weil <sage@newdream.net>
Mon, 15 Mar 2021 20:10:34 +0000 (16:10 -0400)
committerSage Weil <sage@newdream.net>
Mon, 15 Mar 2021 20:10:34 +0000 (16:10 -0400)
* 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>
1  2 
src/pybind/mgr/cephadm/services/cephadmservice.py