Merge pull request #15693 from dillaman/wip-osd-cmpext-ec-pool

author Josh Durgin <jdurgin@redhat.com>

Tue, 25 Jul 2017 20:52:20 +0000 (13:52 -0700)

committer GitHub <noreply@github.com>

Tue, 25 Jul 2017 20:52:20 +0000 (13:52 -0700)
author Josh Durgin <jdurgin@redhat.com>
Tue, 25 Jul 2017 20:52:20 +0000 (13:52 -0700)
committer GitHub <noreply@github.com>
Tue, 25 Jul 2017 20:52:20 +0000 (13:52 -0700)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/PrimaryLogPG.cc
Simple merge
diff --cc src/osd/PrimaryLogPG.h
Simple merge
diff --cc src/osd/osd_types.h
Simple merge
author	Josh Durgin <jdurgin@redhat.com>
	Tue, 25 Jul 2017 20:52:20 +0000 (13:52 -0700)
committer	GitHub <noreply@github.com>
	Tue, 25 Jul 2017 20:52:20 +0000 (13:52 -0700)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PrimaryLogPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PrimaryLogPG.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.h	patch \|	diff1 \|	diff2 \|	blob \| history