Merge pull request #45766 from cbodley/wip-55175

author Yuri Weinstein <yweinste@redhat.com>

Wed, 27 Apr 2022 21:59:52 +0000 (14:59 -0700)

committer GitHub <noreply@github.com>

Wed, 27 Apr 2022 21:59:52 +0000 (14:59 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Wed, 27 Apr 2022 21:59:52 +0000 (14:59 -0700)
committer GitHub <noreply@github.com>
Wed, 27 Apr 2022 21:59:52 +0000 (14:59 -0700)
diff --cc CMakeLists.txt
Simple merge
diff --cc ceph.spec.in
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Wed, 27 Apr 2022 21:59:52 +0000 (14:59 -0700)
committer	GitHub <noreply@github.com>
	Wed, 27 Apr 2022 21:59:52 +0000 (14:59 -0700)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
ceph.spec.in	patch \|	diff1 \|	diff2 \|	blob \| history