Merge pull request #32208 from smithfarm/wip-43280-nautilus

author Yuri Weinstein <yweinste@redhat.com>

Fri, 24 Jan 2020 21:43:35 +0000 (13:43 -0800)

committer GitHub <noreply@github.com>

Fri, 24 Jan 2020 21:43:35 +0000 (13:43 -0800)
author Yuri Weinstein <yweinste@redhat.com>
Fri, 24 Jan 2020 21:43:35 +0000 (13:43 -0800)
committer GitHub <noreply@github.com>
Fri, 24 Jan 2020 21:43:35 +0000 (13:43 -0800)
diff --cc ceph.spec.in
Simple merge
diff --cc install-deps.sh
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Fri, 24 Jan 2020 21:43:35 +0000 (13:43 -0800)
committer	GitHub <noreply@github.com>
	Fri, 24 Jan 2020 21:43:35 +0000 (13:43 -0800)
		1	2
ceph.spec.in	patch \|	diff1 \|	diff2 \|	blob \| history
install-deps.sh	patch \|	diff1 \|	diff2 \|	blob \| history