]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #22560 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Wed, 27 Jun 2018 21:19:03 +0000 (14:19 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Wed, 27 Jun 2018 21:19:03 +0000 (14:19 -0700)
commit4309d7ce1fb81ac0074ec054f9eafc5a84a10cd0
treea45e8c05f3f51d8636b9f830f5d5e4ebdc631902
parent5494e7229a83de27603c8abe1d227a41b53668a9
parent162b1ed5f9fbdfa0661e0ec266ec9669843529fc
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>
src/mds/CDir.cc
src/mds/CInode.cc
src/mds/MDCache.cc
src/mds/Server.cc
src/mds/mdstypes.cc
src/mds/mdstypes.h