]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
projects / ceph-ci.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 753e72d db2e0b9)
Merge PR #33853 into octopus
authorSage Weil <sage@redhat.com>
Tue, 10 Mar 2020 22:19:20 +0000 (17:19 -0500)
committerSage Weil <sage@redhat.com>
Tue, 10 Mar 2020 22:19:20 +0000 (17:19 -0500)
* refs/pull/33853/head:
mgr/cephadm: Make sure we don't co-locate the same daemon

Reviewed-by: Sage Weil <sage@redhat.com>

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