Merge pull request #16884 from liewegas/wip-20919

author Kefu Chai <tchaikov@gmail.com>

Sat, 30 Sep 2017 04:14:14 +0000 (12:14 +0800)

committer GitHub <noreply@github.com>

Sat, 30 Sep 2017 04:14:14 +0000 (12:14 +0800)
author Kefu Chai <tchaikov@gmail.com>
Sat, 30 Sep 2017 04:14:14 +0000 (12:14 +0800)
committer GitHub <noreply@github.com>
Sat, 30 Sep 2017 04:14:14 +0000 (12:14 +0800)
diff --cc src/osd/PrimaryLogPG.cc
Simple merge
diff --cc src/osd/PrimaryLogPG.h
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Sat, 30 Sep 2017 04:14:14 +0000 (12:14 +0800)
committer	GitHub <noreply@github.com>
	Sat, 30 Sep 2017 04:14:14 +0000 (12:14 +0800)
		1	2
src/osd/PrimaryLogPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PrimaryLogPG.h	patch \|	diff1 \|	diff2 \|	blob \| history