Merge pull request #21356 from smithfarm/wip-23657

author Nathan Cutler <presnypreklad@gmail.com>

Fri, 13 Apr 2018 13:59:11 +0000 (15:59 +0200)

committer GitHub <noreply@github.com>

Fri, 13 Apr 2018 13:59:11 +0000 (15:59 +0200)
author Nathan Cutler <presnypreklad@gmail.com>
Fri, 13 Apr 2018 13:59:11 +0000 (15:59 +0200)
committer GitHub <noreply@github.com>
Fri, 13 Apr 2018 13:59:11 +0000 (15:59 +0200)
diff --cc ceph.spec.in
Simple merge
diff --cc debian/control
Simple merge
author	Nathan Cutler <presnypreklad@gmail.com>
	Fri, 13 Apr 2018 13:59:11 +0000 (15:59 +0200)
committer	GitHub <noreply@github.com>
	Fri, 13 Apr 2018 13:59:11 +0000 (15:59 +0200)
		1	2
ceph.spec.in	patch \|	diff1 \|	diff2 \|	blob \| history
debian/control	patch \|	diff1 \|	diff2 \|	blob \| history