From: Kefu Chai <tchaikov@gmail.com>
Date: Wed, 30 May 2018 14:11:42 +0000 (+0800)
Subject: Merge pull request #21711 from majianpeng/osd-reduce-safetimer
X-Git-Tag: v14.0.1~1236
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=301f041be706d6cf496c5f7080f46695d55bf94f;p=ceph.git

Merge pull request #21711 from majianpeng/osd-reduce-safetimer

osd: combine recovery/scrub/snap sleep timer into one.

Reviewed-by: Neha Ojha <nojha@redhat.com>
---

301f041be706d6cf496c5f7080f46695d55bf94f