Merge pull request #19464 from myoungwon/wip-bug-fix-22369

author myoungwon oh <omwmw@sk.com>

Sat, 16 Dec 2017 01:50:44 +0000 (10:50 +0900)

committer GitHub <noreply@github.com>

Sat, 16 Dec 2017 01:50:44 +0000 (10:50 +0900)
author myoungwon oh <omwmw@sk.com>
Sat, 16 Dec 2017 01:50:44 +0000 (10:50 +0900)
committer GitHub <noreply@github.com>
Sat, 16 Dec 2017 01:50:44 +0000 (10:50 +0900)
diff --cc src/osd/PrimaryLogPG.cc
Simple merge
diff --cc src/test/osd/RadosModel.h
Simple merge
author	myoungwon oh <omwmw@sk.com>
	Sat, 16 Dec 2017 01:50:44 +0000 (10:50 +0900)
committer	GitHub <noreply@github.com>
	Sat, 16 Dec 2017 01:50:44 +0000 (10:50 +0900)
		1	2
src/osd/PrimaryLogPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/osd/RadosModel.h	patch \|	diff1 \|	diff2 \|	blob \| history