]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
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)
commit01da68a753e6cb8fdfd10173a00e6444024242ea
treedc47703257c4ff8e351eef2c1d287c4f85257be1
parent3510e8eac643e810002f72f317d1caf45c201e32
parent31ad594a7ac9ad83bef86bca527cc09d2322a4b9
Merge PR #33514 into master

* refs/pull/33514/head:
mgr/cephadm: drop mixin parent

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