From: Sage Weil <sage@redhat.com>
Date: Mon, 13 Aug 2018 18:00:46 +0000 (-0500)
Subject: Merge PR #23512 into master
X-Git-Tag: v14.0.1~595
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=211cd6388bb021fb70e9a06d84e2753a2049af0b;p=ceph-ci.git

Merge PR #23512 into master

* refs/pull/23512/head:
	osd: vary tick interval +/- 5% to avoid scrub livelocks
	osd: tick at OSD_TICK_INTERVAL, not heartbeat interval

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
---

211cd6388bb021fb70e9a06d84e2753a2049af0b