From: Patrick Donnelly <pdonnell@redhat.com>
Date: Mon, 6 Jul 2020 23:50:30 +0000 (-0700)
Subject: Merge PR #35496 into master
X-Git-Tag: v16.1.0~1826
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9b913a1135020e76ee5c180e12ba01114b51537e;p=ceph.git

Merge PR #35496 into master

* refs/pull/35496/head:
	client: introduce timeout for client shutdown

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
---

9b913a1135020e76ee5c180e12ba01114b51537e