Merge pull request #26133 from dillaman/wip-37913

author Mykola Golub <mgolub@suse.com>

Tue, 29 Jan 2019 10:41:23 +0000 (12:41 +0200)

committer GitHub <noreply@github.com>

Tue, 29 Jan 2019 10:41:23 +0000 (12:41 +0200)
author Mykola Golub <mgolub@suse.com>
Tue, 29 Jan 2019 10:41:23 +0000 (12:41 +0200)
committer GitHub <noreply@github.com>
Tue, 29 Jan 2019 10:41:23 +0000 (12:41 +0200)
diff --cc ceph.spec.in
Simple merge
diff --cc debian/control
Simple merge
author	Mykola Golub <mgolub@suse.com>
	Tue, 29 Jan 2019 10:41:23 +0000 (12:41 +0200)
committer	GitHub <noreply@github.com>
	Tue, 29 Jan 2019 10:41:23 +0000 (12:41 +0200)
		1	2
ceph.spec.in	patch \|	diff1 \|	diff2 \|	blob \| history
debian/control	patch \|	diff1 \|	diff2 \|	blob \| history