]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #27802 into master
authorSage Weil <sage@redhat.com>
Tue, 30 Apr 2019 19:04:54 +0000 (14:04 -0500)
committerSage Weil <sage@redhat.com>
Tue, 30 Apr 2019 19:04:54 +0000 (14:04 -0500)
* refs/pull/27802/head:
ceph_telemetry: accept older formats and transform

Reviewed-by: Wido den Hollander <wido@42on.com>
Reviewed-by: Sage Weil <sage@redhat.com>

Trivial merge