Merge pull request #21345 from ceph/fix_e2fsprogs

author Kefu Chai <tchaikov@gmail.com>

Fri, 13 Apr 2018 07:51:29 +0000 (15:51 +0800)

committer GitHub <noreply@github.com>

Fri, 13 Apr 2018 07:51:29 +0000 (15:51 +0800)
author Kefu Chai <tchaikov@gmail.com>
Fri, 13 Apr 2018 07:51:29 +0000 (15:51 +0800)
committer GitHub <noreply@github.com>
Fri, 13 Apr 2018 07:51:29 +0000 (15:51 +0800)
diff --cc ceph.spec.in
Simple merge
diff --cc debian/control
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Fri, 13 Apr 2018 07:51:29 +0000 (15:51 +0800)
committer	GitHub <noreply@github.com>
	Fri, 13 Apr 2018 07:51:29 +0000 (15:51 +0800)
		1	2
ceph.spec.in	patch \|	diff1 \|	diff2 \|	blob \| history
debian/control	patch \|	diff1 \|	diff2 \|	blob \| history