From: Kefu Chai <kchai@redhat.com>
Date: Sun, 10 Oct 2021 01:38:22 +0000 (+0800)
Subject: Merge pull request #43401 from romoh/master
X-Git-Tag: v17.1.0~727
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9a71badb0d9cba815a18c71e2e8ffa5195d6686f;p=ceph.git

Merge pull request #43401 from romoh/master

src/cephadm: Add support for mariner

Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
Reviewed-by: Varsha Rao <rvarsha016@gmail.com>
---

9a71badb0d9cba815a18c71e2e8ffa5195d6686f