]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #23280 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Sun, 12 Aug 2018 21:25:01 +0000 (14:25 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Sun, 12 Aug 2018 21:25:01 +0000 (14:25 -0700)
* refs/pull/23280/head:
cephfs: LeaseStat versioning
cephfs: DirStat versioning
mds: make has_feature const function
cephfs: InodeStat versioning
mds: add new feature bit

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

Trivial merge