From: Patrick Donnelly <pdonnell@redhat.com>
Date: Sun, 27 Jan 2019 00:50:16 +0000 (-0800)
Subject: Merge PR #26087 into master
X-Git-Tag: v14.1.0~289
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=585624d86ba1f2cdd7794eccabfd17fa6e89a72e;p=ceph.git

Merge PR #26087 into master

* refs/pull/26087/head:
	mds: fix MDSGather inheritance
	include: remove unnecessary inheritance

Reviewed-by: Sage Weil <sage@redhat.com>
---

585624d86ba1f2cdd7794eccabfd17fa6e89a72e