Merge pull request #19529 from thmour/master

author Kefu Chai <tchaikov@gmail.com>

Wed, 10 Jan 2018 15:28:52 +0000 (23:28 +0800)

committer GitHub <noreply@github.com>

Wed, 10 Jan 2018 15:28:52 +0000 (23:28 +0800)
author Kefu Chai <tchaikov@gmail.com>
Wed, 10 Jan 2018 15:28:52 +0000 (23:28 +0800)
committer GitHub <noreply@github.com>
Wed, 10 Jan 2018 15:28:52 +0000 (23:28 +0800)
diff --cc ceph.spec.in
Simple merge
diff --cc debian/control
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Wed, 10 Jan 2018 15:28:52 +0000 (23:28 +0800)
committer	GitHub <noreply@github.com>
	Wed, 10 Jan 2018 15:28:52 +0000 (23:28 +0800)
		1	2
ceph.spec.in	patch \|	diff1 \|	diff2 \|	blob \| history
debian/control	patch \|	diff1 \|	diff2 \|	blob \| history