From: Sage Weil <sage@redhat.com>
Date: Mon, 2 Mar 2020 01:53:25 +0000 (-0600)
Subject: Merge PR #33575 into master
X-Git-Tag: v15.1.1~187
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4ad485d285e384bd59750b335ee74c3b7d363440;p=ceph.git

Merge PR #33575 into master

* refs/pull/33575/head:
	mgr/telemetry: fix and document proxy usage

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Yaarit Hatuka <yaarithatuka@gmail.com>
---

4ad485d285e384bd59750b335ee74c3b7d363440