From: Sage Weil <sage@newdream.net>
Date: Wed, 21 Apr 2021 17:35:40 +0000 (-0400)
Subject: Merge PR #40966 into master
X-Git-Tag: v17.1.0~2188
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=46a4bb5cb3a5dd9185d31d15390a325ce508d130;p=ceph.git

Merge PR #40966 into master

* refs/pull/40966/head:
	doc/cephadm: osd: rewrite "additional opts"

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

46a4bb5cb3a5dd9185d31d15390a325ce508d130