From: Sage Weil <sage@newdream.net>
Date: Tue, 13 Jul 2021 16:04:55 +0000 (-0400)
Subject: Merge PR #42227 into master
X-Git-Tag: v17.1.0~1422
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ea7ac19e0a61b50ee3e735a1d7eda2da12dfdad8;p=ceph.git

Merge PR #42227 into master

* refs/pull/42227/head:
	doc/man/8/cephadm: add --log-to-file (and --single-host-defaults)
	cephadm: add bootstrap --log-to-file option

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

ea7ac19e0a61b50ee3e735a1d7eda2da12dfdad8