Merge PR ceph#33794 into master

* refs/pull/33794/head: pybind/mgr/mgr_util: fix pretty time delta Reviewed-by: Kefu Chai <[email protected]>
suab321321 · Mar 7, 2020 · 053fd8f · 053fd8f
2 parents f0cc507 + 822ee34
commit 053fd8f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/pybind/mgr/mgr_util.py b/src/pybind/mgr/mgr_util.py
@@ -384,7 +384,7 @@ def to_pretty_timedelta(n):
     if n < datetime.timedelta(minutes=120):
         return str(n.seconds // 60) + 'm'
     if n < datetime.timedelta(hours=48):
-        return str(n.seconds // 360) + 'h'
+        return str(n.seconds // 3600) + 'h'
     if n < datetime.timedelta(days=14):
         return str(n.days) + 'd'
     if n < datetime.timedelta(days=7*12):