]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
Merge PR #31060 into master
authorSage Weil <sage@redhat.com>
Tue, 22 Oct 2019 20:27:14 +0000 (15:27 -0500)
committerSage Weil <sage@redhat.com>
Tue, 22 Oct 2019 20:27:14 +0000 (15:27 -0500)
commit732596e6518876df8f8659d40a285598ee828b60
tree877d77c9071c5395c37a9e907a158e61fa8c48cb
parent22999b1b507bebbb2819feea32e324ce9003a1d2
parentf48e24de6de42defab72ef494058ac560c510a65
Merge PR #31060 into master

* refs/pull/31060/head:
ceph-daemon: make rm-cluster clear out previously failed units
ceph-daemon: fix get_config_and_both_keyrings() return value