From: Patrick Donnelly <pdonnell@redhat.com>
Date: Sat, 12 Jun 2021 00:10:41 +0000 (-0700)
Subject: Merge PR #39505 into master
X-Git-Tag: v17.1.0~1675
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=95f0e9c959705590a430d40b989150b235a68300;p=ceph.git

Merge PR #39505 into master

* refs/pull/39505/head:
	qa: test nowsync option in kernel client workflows
	qa: deep merge top level overrides for fuse/kclient

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
---

95f0e9c959705590a430d40b989150b235a68300