From: Sage Weil <sage@redhat.com>
Date: Thu, 1 Aug 2019 01:27:27 +0000 (-0500)
Subject: Merge PR #29334 into master
X-Git-Tag: v15.1.0~1999
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9edfc9578f4df6201602c95df6ea990bf10dc94d;p=ceph.git

Merge PR #29334 into master

* refs/pull/29334/head:
	qa/tasks/mgr/dashboard/test_mgr_module: adjust expected schema
	mgr/telemetry: separate out cluster config vs running daemons
	mgr/telemetry: include any config options that are customized

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Dan Mick <dmick@redhat.com>
---

9edfc9578f4df6201602c95df6ea990bf10dc94d