Merge pull request #30046 from smithfarm/wip-40270-nautilus

author Yuri Weinstein <yweinste@redhat.com>

Sat, 16 Nov 2019 15:51:46 +0000 (07:51 -0800)

committer GitHub <noreply@github.com>

Sat, 16 Nov 2019 15:51:46 +0000 (07:51 -0800)
author Yuri Weinstein <yweinste@redhat.com>
Sat, 16 Nov 2019 15:51:46 +0000 (07:51 -0800)
committer GitHub <noreply@github.com>
Sat, 16 Nov 2019 15:51:46 +0000 (07:51 -0800)
diff --cc ceph.spec.in
Simple merge
diff --cc debian/control
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Sat, 16 Nov 2019 15:51:46 +0000 (07:51 -0800)
committer	GitHub <noreply@github.com>
	Sat, 16 Nov 2019 15:51:46 +0000 (07:51 -0800)
		1	2
ceph.spec.in	patch \|	diff1 \|	diff2 \|	blob \| history
debian/control	patch \|	diff1 \|	diff2 \|	blob \| history