From: Sage Weil <sage@redhat.com>
Date: Thu, 12 Mar 2020 11:37:19 +0000 (-0500)
Subject: Merge PR #33870 into octopus
X-Git-Tag: v15.1.1~30
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=83c6921920688dd2d3bec984136a69e1f86bd2c5;p=ceph.git

Merge PR #33870 into octopus

* refs/pull/33870/head:
	mgr/cephadm: fix redeploy for the crash daemon
	cephadm: prefer config/keyring args
	cephadm: raise Error when no config/keyring
	cephadm: consolidate logic for reading `config-json`
	cephadm: merge `--config-and-keyring` and `--config-json` args

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
---

83c6921920688dd2d3bec984136a69e1f86bd2c5