Merge pull request #11143 from kylinstorage/wip-fix-write-hang

author Kefu Chai <tchaikov@gmail.com>

Mon, 24 Oct 2016 16:16:17 +0000 (00:16 +0800)

committer GitHub <noreply@github.com>

Mon, 24 Oct 2016 16:16:17 +0000 (00:16 +0800)
author Kefu Chai <tchaikov@gmail.com>
Mon, 24 Oct 2016 16:16:17 +0000 (00:16 +0800)
committer GitHub <noreply@github.com>
Mon, 24 Oct 2016 16:16:17 +0000 (00:16 +0800)
diff --cc src/osd/ReplicatedPG.cc
Simple merge
diff --cc src/osd/ReplicatedPG.h
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Mon, 24 Oct 2016 16:16:17 +0000 (00:16 +0800)
committer	GitHub <noreply@github.com>
	Mon, 24 Oct 2016 16:16:17 +0000 (00:16 +0800)
		1	2
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.h	patch \|	diff1 \|	diff2 \|	blob \| history