From: Sage Weil <sage@redhat.com>
Date: Wed, 19 Feb 2020 02:56:54 +0000 (-0600)
Subject: Merge PR #32949 into master
X-Git-Tag: v15.1.1~373
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=99c0813a6c5c741856814aa46e89cb6a26dd7f6a;p=ceph.git

Merge PR #32949 into master

* refs/pull/32949/head:
	cephadm: separate out require files in config-json
	cephadm: add alertmanager deployment feature

Reviewed-by: Patrick Seidensal <pseidensal@suse.com>
---

99c0813a6c5c741856814aa46e89cb6a26dd7f6a