Merge PR #26262 into master

author Sage Weil <sage@redhat.com>

Wed, 20 Feb 2019 19:05:11 +0000 (13:05 -0600)

committer Sage Weil <sage@redhat.com>

Wed, 20 Feb 2019 19:05:11 +0000 (13:05 -0600)
author Sage Weil <sage@redhat.com>
Wed, 20 Feb 2019 19:05:11 +0000 (13:05 -0600)
committer Sage Weil <sage@redhat.com>
Wed, 20 Feb 2019 19:05:11 +0000 (13:05 -0600)
diff --cc ceph.spec.in
Simple merge
diff --cc debian/control
Simple merge
author	Sage Weil <sage@redhat.com>
	Wed, 20 Feb 2019 19:05:11 +0000 (13:05 -0600)
committer	Sage Weil <sage@redhat.com>
	Wed, 20 Feb 2019 19:05:11 +0000 (13:05 -0600)
		1	2
ceph.spec.in	patch \|	diff1 \|	diff2 \|	blob \| history
debian/control	patch \|	diff1 \|	diff2 \|	blob \| history