Merge pull request #20947 from dzafman/wip-23364

author David Zafman <dzafman@redhat.com>

Tue, 10 Apr 2018 23:32:09 +0000 (16:32 -0700)

committer GitHub <noreply@github.com>

Tue, 10 Apr 2018 23:32:09 +0000 (16:32 -0700)
author David Zafman <dzafman@redhat.com>
Tue, 10 Apr 2018 23:32:09 +0000 (16:32 -0700)
committer GitHub <noreply@github.com>
Tue, 10 Apr 2018 23:32:09 +0000 (16:32 -0700)
diff --cc src/osd/ECBackend.cc
Simple merge
diff --cc src/osd/osd_types.cc
Simple merge
author	David Zafman <dzafman@redhat.com>
	Tue, 10 Apr 2018 23:32:09 +0000 (16:32 -0700)
committer	GitHub <noreply@github.com>
	Tue, 10 Apr 2018 23:32:09 +0000 (16:32 -0700)
		1	2
src/osd/ECBackend.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.cc	patch \|	diff1 \|	diff2 \|	blob \| history