From: Patrick Donnelly <pdonnell@redhat.com>
Date: Thu, 24 May 2018 19:11:54 +0000 (-0700)
Subject: Merge PR #22138 into mimic
X-Git-Tag: v13.2.0~24
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=bd14e01ea3d6917dc008e7c7b21b705aef1acc50;p=ceph.git

Merge PR #22138 into mimic

* refs/pull/22138/head:
	mds: reply session reject for open request from blacklisted client
	qa/tasks/cephfs: add timeout parameter to kclient umount_wait

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

bd14e01ea3d6917dc008e7c7b21b705aef1acc50