Merge pull request #19865 from smithfarm/wip-22634-luminous

author Yuri Weinstein <yuri.weinstein@gmail.com>

Fri, 2 Feb 2018 22:59:49 +0000 (14:59 -0800)

committer GitHub <noreply@github.com>

Fri, 2 Feb 2018 22:59:49 +0000 (14:59 -0800)
author Yuri Weinstein <yuri.weinstein@gmail.com>
Fri, 2 Feb 2018 22:59:49 +0000 (14:59 -0800)
committer GitHub <noreply@github.com>
Fri, 2 Feb 2018 22:59:49 +0000 (14:59 -0800)
diff --cc ceph.spec.in
Simple merge
diff --cc debian/control
Simple merge
author	Yuri Weinstein <yuri.weinstein@gmail.com>
	Fri, 2 Feb 2018 22:59:49 +0000 (14:59 -0800)
committer	GitHub <noreply@github.com>
	Fri, 2 Feb 2018 22:59:49 +0000 (14:59 -0800)
		1	2
ceph.spec.in	patch \|	diff1 \|	diff2 \|	blob \| history
debian/control	patch \|	diff1 \|	diff2 \|	blob \| history