Merge pull request #39771 from ivancich/wip-49187-nautilus

author Yuri Weinstein <yweinste@redhat.com>

Fri, 4 Jun 2021 15:09:17 +0000 (08:09 -0700)

committer GitHub <noreply@github.com>

Fri, 4 Jun 2021 15:09:17 +0000 (08:09 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Fri, 4 Jun 2021 15:09:17 +0000 (08:09 -0700)
committer GitHub <noreply@github.com>
Fri, 4 Jun 2021 15:09:17 +0000 (08:09 -0700)
diff --cc ceph.spec.in
Simple merge
diff --cc debian/control
Simple merge
diff --cc src/rgw/CMakeLists.txt
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Fri, 4 Jun 2021 15:09:17 +0000 (08:09 -0700)
committer	GitHub <noreply@github.com>
	Fri, 4 Jun 2021 15:09:17 +0000 (08:09 -0700)
		1	2
ceph.spec.in	patch \|	diff1 \|	diff2 \|	blob \| history
debian/control	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history