From: Patrick Donnelly <pdonnell@redhat.com>
Date: Fri, 30 Jul 2021 21:00:19 +0000 (-0700)
Subject: Merge PR #42201 into master
X-Git-Tag: v17.1.0~1243
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c99a5e56a60e5d86d955856ee56abb4e08f9f8c3;p=ceph.git

Merge PR #42201 into master

* refs/pull/42201/head:
	qa: fold frag confs into conf/mds.yaml

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
---

c99a5e56a60e5d86d955856ee56abb4e08f9f8c3