From: Patrick Donnelly <pdonnell@redhat.com>
Date: Fri, 12 Jun 2020 21:06:57 +0000 (-0700)
Subject: Merge PR #35368 into master
X-Git-Tag: v16.1.0~2073
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b40d5ee8037bbb996193d7ff136be46eba4b37fc;p=ceph.git

Merge PR #35368 into master

* refs/pull/35368/head:
	fuse: update to newer FUSE_USE_VERSION

Reviewed-by: Xiubo Li <xiubli@redhat.com>
Reviewed-by: Milind Changire <mchangir@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
---

b40d5ee8037bbb996193d7ff136be46eba4b37fc
diff --cc .githubmap
index 2a9793a34428e,2a9793a34428e..6486b04d8d0f8
--- a/.githubmap
+++ b/.githubmap
@@@ -120,3 -120,3 +120,4 @@@ lxbsz Xiubo Li <xiubli@redhat.com
  asettle Alexandra Settle <asettle@suse.com>
  vumrao Vikhyat Umrao <vikhyat@redhat.com>
  saschagrunert Sascha Grunert <sgrunert@suse.com>
++mchangir Milind Changire <mchangir@redhat.com>