From: Patrick Donnelly <pdonnell@redhat.com>
Date: Wed, 12 Dec 2018 20:41:46 +0000 (-0800)
Subject: Merge PR #25316 into master
X-Git-Tag: v14.1.0~638
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3b21c536d80cee4ce62d260cfea680b4963db305;p=ceph.git

Merge PR #25316 into master

* refs/pull/25316/head:
	client: don't update importing caps' mseq when handing cap export
	mds: don't exclude disallowed caps when recording wanted caps

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

3b21c536d80cee4ce62d260cfea680b4963db305