From: Patrick Donnelly <pdonnell@redhat.com>
Date: Fri, 3 Nov 2017 21:35:07 +0000 (-0700)
Subject: Merge PR #18646 into master
X-Git-Tag: v13.0.1~297
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=29b850c01b860f76fabf52ab8f90b8f0f0a079ff;p=ceph.git

Merge PR #18646 into master

* refs/pull/18646/head:
	mds: fix MDS_FEATURE_INCOMPAT_FILE_LAYOUT_V2 definition
	mds: remove useless incompat feature definination in FSMap.h

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

29b850c01b860f76fabf52ab8f90b8f0f0a079ff