From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 17 Dec 2019 00:06:30 +0000 (-0800)
Subject: Merge PR #31662 into master
X-Git-Tag: v15.1.0~471
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=77f7b8d9c4792e5c5ff2bffa677e1b7e132b5710;p=ceph-ci.git

Merge PR #31662 into master

* refs/pull/31662/head:
	mds: fix revoking caps after after stale->resume circle
	client: fix incorrect debug message

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

77f7b8d9c4792e5c5ff2bffa677e1b7e132b5710