From: Sage Weil <sage@redhat.com>
Date: Thu, 19 Mar 2020 13:07:05 +0000 (-0500)
Subject: Merge PR #34045 into octopus
X-Git-Tag: v15.2.0~19
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=74fd8e7aa327ef16ff444d722d713139a3550367;p=ceph.git

Merge PR #34045 into octopus

* refs/pull/34045/head:
	mgr/progress: fix duration strings

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
---

74fd8e7aa327ef16ff444d722d713139a3550367