Merge pull request #27949 from smithfarm/wip-37613-mimic

author Yuri Weinstein <yweinste@redhat.com>

Wed, 17 Jul 2019 19:46:02 +0000 (12:46 -0700)

committer GitHub <noreply@github.com>

Wed, 17 Jul 2019 19:46:02 +0000 (12:46 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Wed, 17 Jul 2019 19:46:02 +0000 (12:46 -0700)
committer GitHub <noreply@github.com>
Wed, 17 Jul 2019 19:46:02 +0000 (12:46 -0700)
diff --cc ceph.spec.in
Simple merge
diff --cc debian/control
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Wed, 17 Jul 2019 19:46:02 +0000 (12:46 -0700)
committer	GitHub <noreply@github.com>
	Wed, 17 Jul 2019 19:46:02 +0000 (12:46 -0700)
		1	2
ceph.spec.in	patch \|	diff1 \|	diff2 \|	blob \| history
debian/control	patch \|	diff1 \|	diff2 \|	blob \| history