Merge pull request #12142 from athanatos/wip-17966

author David Zafman <dzafman@redhat.com>

Wed, 23 Nov 2016 19:24:17 +0000 (11:24 -0800)

committer GitHub <noreply@github.com>

Wed, 23 Nov 2016 19:24:17 +0000 (11:24 -0800)
author David Zafman <dzafman@redhat.com>
Wed, 23 Nov 2016 19:24:17 +0000 (11:24 -0800)
committer GitHub <noreply@github.com>
Wed, 23 Nov 2016 19:24:17 +0000 (11:24 -0800)
diff --cc src/osd/ECBackend.cc
Simple merge
diff --cc src/osd/ECBackend.h
Simple merge
author	David Zafman <dzafman@redhat.com>
	Wed, 23 Nov 2016 19:24:17 +0000 (11:24 -0800)
committer	GitHub <noreply@github.com>
	Wed, 23 Nov 2016 19:24:17 +0000 (11:24 -0800)
		1	2
src/osd/ECBackend.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ECBackend.h	patch \|	diff1 \|	diff2 \|	blob \| history