]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #34045 into octopus
authorSage Weil <sage@redhat.com>
Thu, 19 Mar 2020 13:07:05 +0000 (08:07 -0500)
committerSage Weil <sage@redhat.com>
Thu, 19 Mar 2020 13:07:05 +0000 (08:07 -0500)
* refs/pull/34045/head:
mgr/progress: fix duration strings

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

Trivial merge