Merge pull request #5570 from dachary/wip-12673-proxy-read

author Kefu Chai <tchaikov@gmail.com>

Mon, 31 Aug 2015 04:04:59 +0000 (12:04 +0800)

committer Kefu Chai <tchaikov@gmail.com>

Mon, 31 Aug 2015 04:04:59 +0000 (12:04 +0800)
author Kefu Chai <tchaikov@gmail.com>
Mon, 31 Aug 2015 04:04:59 +0000 (12:04 +0800)
committer Kefu Chai <tchaikov@gmail.com>
Mon, 31 Aug 2015 04:04:59 +0000 (12:04 +0800)
diff --cc qa/workunits/cephtool/test.sh
Simple merge
diff --cc src/osd/ReplicatedPG.cc
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Mon, 31 Aug 2015 04:04:59 +0000 (12:04 +0800)
committer	Kefu Chai <tchaikov@gmail.com>
	Mon, 31 Aug 2015 04:04:59 +0000 (12:04 +0800)
		1	2
qa/workunits/cephtool/test.sh	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history