]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #26921 into nautilus
authorSage Weil <sage@redhat.com>
Thu, 14 Mar 2019 12:01:46 +0000 (07:01 -0500)
committerSage Weil <sage@redhat.com>
Thu, 14 Mar 2019 12:01:46 +0000 (07:01 -0500)
* refs/pull/26921/head:
mgr/telemetry: fix 'telemetry {on,off}'

Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Trivial merge