From: Patrick Donnelly <pdonnell@redhat.com>
Date: Fri, 1 Nov 2019 22:34:41 +0000 (-0700)
Subject: Merge PR #31137 into master
X-Git-Tag: v15.1.0~1080
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=463b31d71d4426cb1994039b003ebc83769c5b51;p=ceph.git

Merge PR #31137 into master

* refs/pull/31137/head:
	msg/DispatchQueue: Set throttle stamp for local_delivery

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
---

463b31d71d4426cb1994039b003ebc83769c5b51