]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #33575 into master
authorSage Weil <sage@redhat.com>
Mon, 2 Mar 2020 01:53:25 +0000 (19:53 -0600)
committerSage Weil <sage@redhat.com>
Mon, 2 Mar 2020 01:53:25 +0000 (19:53 -0600)
* 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>

Trivial merge