]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #33514 into master
authorSage Weil <sage@redhat.com>
Mon, 24 Feb 2020 20:39:54 +0000 (14:39 -0600)
committerSage Weil <sage@redhat.com>
Mon, 24 Feb 2020 20:39:54 +0000 (14:39 -0600)
* refs/pull/33514/head:
mgr/cephadm: drop mixin parent

Reviewed-by: Sebastian Wagner <swagner@suse.com>

Trivial merge