From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 24 Sep 2019 11:32:28 +0000 (-0700)
Subject: Merge PR #29824 into master
X-Git-Tag: v15.1.0~1442
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=30909f5a6a2f21ac072c8744e05fa973fa2d1d37;p=ceph.git

Merge PR #29824 into master

* refs/pull/29824/head:
	qa: whitelist new FS_INLINE_DATA_DEPRECATED health warning
	mds: add a HEALTH_WARN message when inline_data is enabled
	mds: log a warning message when mds is started on an fs with inline_data
	mon: deprecate CephFS inline_data support

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Douglas Fuller <dfuller@redhat.com>
---

30909f5a6a2f21ac072c8744e05fa973fa2d1d37