]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit6542f1459111a7b28da9198d99bf9c7e4d56329d
tree7a46da7ce386e6ca4c1a21f1bea396071ea51bb9tree | snapshot
parent753e72d5b3d83b9e3db885afc9de7953944bfab0commit | diff
parentdb2e0b974726992060ee1b11ba83e9335882c110commit | diff
Merge PR #33853 into octopus

* refs/pull/33853/head:
mgr/cephadm: Make sure we don't co-locate the same daemon

Reviewed-by: Sage Weil <sage@redhat.com>
Unnamed repository; edit this file 'description' to name the repository.