From: Patrick Donnelly <pdonnell@redhat.com>
Date: Sun, 29 Apr 2018 18:05:27 +0000 (-0700)
Subject: Merge PR #21592 into master
X-Git-Tag: v13.1.0~50
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5a56301945d910c0f2ca36107ec812f4823010b5;p=ceph.git

Merge PR #21592 into master

* refs/pull/21592/head:
	mds: filter out blacklisted clients when importing caps
	mds: don't add blacklisted clients to reconnect gather set
	mds: combine MDCache::{cap_exports,cap_export_targets}

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

5a56301945d910c0f2ca36107ec812f4823010b5