From: Sage Weil <sage@redhat.com>
Date: Sat, 22 Feb 2020 14:16:17 +0000 (-0600)
Subject: Merge PR #33472 into master
X-Git-Tag: v15.1.1~308
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=37e523013b15cc992e0772d2b9474fd2667de691;p=ceph.git

Merge PR #33472 into master

* refs/pull/33472/head:
	cephadm: allow users to provide their dashboard cert during bootstrap

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

37e523013b15cc992e0772d2b9474fd2667de691