]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
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)
commit52c016aa02a3608a428898a8de03ea347f9d0d5f
treebf5552d3d6f4f7f198a541e4cdd2cedb32e90097
parentfac424f84eb6dd52d73fa3ce53a25f37cd8e5237
parent8ceea1961f818dc2d07edf9c256ebe5150b6b133
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>
src/pybind/mgr/cephadm/services/cephadmservice.py