From: Sage Weil <sage@newdream.net>
Date: Mon, 15 Feb 2021 21:25:01 +0000 (-0500)
Subject: Merge PR #39482 into master
X-Git-Tag: v17.1.0~2972
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9200b1ea8e5e4309e435202948e61c9247d5ceff;p=ceph.git

Merge PR #39482 into master

* refs/pull/39482/head:
	Revert "Merge pull request #37764 from mgfritch/cephadm-no-container-init"

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

9200b1ea8e5e4309e435202948e61c9247d5ceff