From: Patrick Donnelly <pdonnell@redhat.com>
Date: Wed, 27 Jun 2018 21:19:03 +0000 (-0700)
Subject: Merge PR #22560 into master
X-Git-Tag: v14.0.1~989
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4309d7ce1fb81ac0074ec054f9eafc5a84a10cd0;p=ceph.git

Merge PR #22560 into master

* refs/pull/22560/head:
	qa/fs/upgrade/snaps: whitelist inconsistent rstat
	mds: track snapshot count in rstat
	mds: add MAY_SNAPSHOT in MDSAuthCaps

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

4309d7ce1fb81ac0074ec054f9eafc5a84a10cd0