From: Sage Weil <sage@newdream.net>
Date: Sat, 30 Oct 2021 19:51:31 +0000 (-0400)
Subject: Merge PR #43734 into master
X-Git-Tag: v17.1.0~556
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bd093a848db30548afade1fc762b150bac8954cf;p=ceph.git

Merge PR #43734 into master

* refs/pull/43734/head:
	cephadm: --config-json overrides --config or --keyring args

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

bd093a848db30548afade1fc762b150bac8954cf