From: Sage Weil <sage@newdream.net>
Date: Tue, 3 Aug 2021 14:45:01 +0000 (-0400)
Subject: Merge PR #42518 into master
X-Git-Tag: v17.1.0~1216
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f4dff25bed817b32b52354315aa75b44d24378f4;p=ceph.git

Merge PR #42518 into master

* refs/pull/42518/head:
	doc/cephadm: update about disabling logging to journald for quincy
	doc/cephadm: remove repeated section on disabling logging to stderr

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

f4dff25bed817b32b52354315aa75b44d24378f4