Merge pull request #19133 from smithfarm/wip-22194-luminous

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

Wed, 31 Jan 2018 00:33:43 +0000 (16:33 -0800)

committer GitHub <noreply@github.com>

Wed, 31 Jan 2018 00:33:43 +0000 (16:33 -0800)
author Yuri Weinstein <yuri.weinstein@gmail.com>
Wed, 31 Jan 2018 00:33:43 +0000 (16:33 -0800)
committer GitHub <noreply@github.com>
Wed, 31 Jan 2018 00:33:43 +0000 (16:33 -0800)
diff --cc CMakeLists.txt
Simple merge
diff --cc ceph.spec.in
Simple merge
diff --cc debian/rules
Simple merge
author	Yuri Weinstein <yuri.weinstein@gmail.com>
	Wed, 31 Jan 2018 00:33:43 +0000 (16:33 -0800)
committer	GitHub <noreply@github.com>
	Wed, 31 Jan 2018 00:33:43 +0000 (16:33 -0800)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
ceph.spec.in	patch \|	diff1 \|	diff2 \|	blob \| history
debian/rules	patch \|	diff1 \|	diff2 \|	blob \| history