Merge pull request #29772 from smithfarm/wip-41350-nautilus

author Yuri Weinstein <yweinste@redhat.com>

Wed, 13 Nov 2019 16:45:42 +0000 (08:45 -0800)

committer GitHub <noreply@github.com>

Wed, 13 Nov 2019 16:45:42 +0000 (08:45 -0800)
author Yuri Weinstein <yweinste@redhat.com>
Wed, 13 Nov 2019 16:45:42 +0000 (08:45 -0800)
committer GitHub <noreply@github.com>
Wed, 13 Nov 2019 16:45:42 +0000 (08:45 -0800)
diff --cc CMakeLists.txt
Simple merge
diff --cc ceph.spec.in
Simple merge
diff --cc debian/control
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Wed, 13 Nov 2019 16:45:42 +0000 (08:45 -0800)
committer	GitHub <noreply@github.com>
	Wed, 13 Nov 2019 16:45:42 +0000 (08:45 -0800)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
ceph.spec.in	patch \|	diff1 \|	diff2 \|	blob \| history
debian/control	patch \|	diff1 \|	diff2 \|	blob \| history