Merge pull request #21273 from jdurgin/wip-23195

author Sage Weil <sage@newdream.net>

Tue, 24 Apr 2018 22:20:25 +0000 (17:20 -0500)

committer GitHub <noreply@github.com>

Tue, 24 Apr 2018 22:20:25 +0000 (17:20 -0500)
author Sage Weil <sage@newdream.net>
Tue, 24 Apr 2018 22:20:25 +0000 (17:20 -0500)
committer GitHub <noreply@github.com>
Tue, 24 Apr 2018 22:20:25 +0000 (17:20 -0500)
diff --cc src/osd/ECBackend.cc
Simple merge
diff --cc src/osd/ECBackend.h
Simple merge
author	Sage Weil <sage@newdream.net>
	Tue, 24 Apr 2018 22:20:25 +0000 (17:20 -0500)
committer	GitHub <noreply@github.com>
	Tue, 24 Apr 2018 22:20:25 +0000 (17:20 -0500)
		1	2
src/osd/ECBackend.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ECBackend.h	patch \|	diff1 \|	diff2 \|	blob \| history