Merge pull request #17391 from myoungwon/wip-proxywrite-cleanup

author Sage Weil <sage@newdream.net>

Fri, 1 Sep 2017 21:26:50 +0000 (16:26 -0500)

committer GitHub <noreply@github.com>

Fri, 1 Sep 2017 21:26:50 +0000 (16:26 -0500)
author Sage Weil <sage@newdream.net>
Fri, 1 Sep 2017 21:26:50 +0000 (16:26 -0500)
committer GitHub <noreply@github.com>
Fri, 1 Sep 2017 21:26:50 +0000 (16:26 -0500)
diff --cc src/osd/PrimaryLogPG.cc
Simple merge
diff --cc src/osd/PrimaryLogPG.h
Simple merge
author	Sage Weil <sage@newdream.net>
	Fri, 1 Sep 2017 21:26:50 +0000 (16:26 -0500)
committer	GitHub <noreply@github.com>
	Fri, 1 Sep 2017 21:26:50 +0000 (16:26 -0500)
		1	2
src/osd/PrimaryLogPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PrimaryLogPG.h	patch \|	diff1 \|	diff2 \|	blob \| history