Merge pull request #6967 from majianpeng/osd-full-skip-readop

author Kefu Chai <tchaikov@gmail.com>

Mon, 13 Jun 2016 05:05:49 +0000 (13:05 +0800)

committer GitHub <noreply@github.com>

Mon, 13 Jun 2016 05:05:49 +0000 (13:05 +0800)
author Kefu Chai <tchaikov@gmail.com>
Mon, 13 Jun 2016 05:05:49 +0000 (13:05 +0800)
committer GitHub <noreply@github.com>
Mon, 13 Jun 2016 05:05:49 +0000 (13:05 +0800)
diff --cc src/osd/ReplicatedPG.cc
Simple merge
diff --cc src/osdc/Objecter.cc
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Mon, 13 Jun 2016 05:05:49 +0000 (13:05 +0800)
committer	GitHub <noreply@github.com>
	Mon, 13 Jun 2016 05:05:49 +0000 (13:05 +0800)
		1	2
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osdc/Objecter.cc	patch \|	diff1 \|	diff2 \|	blob \| history