From: Sage Weil <sage@newdream.net>
Date: Wed, 24 Mar 2021 00:15:11 +0000 (-0400)
Subject: Merge PR #40322 into master
X-Git-Tag: v17.1.0~2502
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=76ae7532c3e38e471163629341955f9ddb6df9fb;p=ceph.git

Merge PR #40322 into master

* refs/pull/40322/head:
	cephadm: only bootstrap using image that matches cephadm version

Reviewed-by: Adam King <adking@redhat.com>
---

76ae7532c3e38e471163629341955f9ddb6df9fb