]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 22999b1 f48e24d)
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)
* refs/pull/31060/head:
ceph-daemon: make rm-cluster clear out previously failed units
ceph-daemon: fix get_config_and_both_keyrings() return value


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