From: Sage Weil <sage@redhat.com>
Date: Tue, 30 Apr 2019 19:04:54 +0000 (-0500)
Subject: Merge PR #27802 into master
X-Git-Tag: v15.1.0~2777
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=876d01dd586f1a599e39c9a37c7b6c56183347dc;p=ceph-ci.git

Merge PR #27802 into master

* 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>
---

876d01dd586f1a599e39c9a37c7b6c56183347dc