From: Patrick Donnelly <pdonnell@redhat.com>
Date: Mon, 8 Jun 2020 19:07:04 +0000 (-0700)
Subject: Merge PR #35470 into master
X-Git-Tag: wip-pdonnell-testing-20200918.022351~1048
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=80ab4f11b9a34e576ec3e392c01bf0ae5ca168de;p=ceph-ci.git

Merge PR #35470 into master

* refs/pull/35470/head:
	mds: fix compile error with CephContext declaration

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

80ab4f11b9a34e576ec3e392c01bf0ae5ca168de