Merge pull request #18311 from shinobu-x/sk-osd_20171015

author Kefu Chai <tchaikov@gmail.com>

Thu, 19 Oct 2017 05:54:31 +0000 (13:54 +0800)

committer GitHub <noreply@github.com>

Thu, 19 Oct 2017 05:54:31 +0000 (13:54 +0800)
author Kefu Chai <tchaikov@gmail.com>
Thu, 19 Oct 2017 05:54:31 +0000 (13:54 +0800)
committer GitHub <noreply@github.com>
Thu, 19 Oct 2017 05:54:31 +0000 (13:54 +0800)
diff --cc src/osd/ECBackend.cc
Simple merge
diff --cc src/osd/PrimaryLogPG.cc
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Thu, 19 Oct 2017 05:54:31 +0000 (13:54 +0800)
committer	GitHub <noreply@github.com>
	Thu, 19 Oct 2017 05:54:31 +0000 (13:54 +0800)
		1	2
src/osd/ECBackend.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PrimaryLogPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history