Merge pull request #6298 from guangyy/wip-13441

author Sage Weil <sage@redhat.com>

Wed, 23 Dec 2015 22:05:54 +0000 (17:05 -0500)

committer Sage Weil <sage@redhat.com>

Wed, 23 Dec 2015 22:05:54 +0000 (17:05 -0500)
author Sage Weil <sage@redhat.com>
Wed, 23 Dec 2015 22:05:54 +0000 (17:05 -0500)
committer Sage Weil <sage@redhat.com>
Wed, 23 Dec 2015 22:05:54 +0000 (17:05 -0500)
diff --cc src/osd/ReplicatedPG.cc
Simple merge
diff --cc src/test/osd/osd-scrub-repair.sh
Simple merge
author	Sage Weil <sage@redhat.com>
	Wed, 23 Dec 2015 22:05:54 +0000 (17:05 -0500)
committer	Sage Weil <sage@redhat.com>
	Wed, 23 Dec 2015 22:05:54 +0000 (17:05 -0500)
		1	2
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/osd/osd-scrub-repair.sh	patch \|	diff1 \|	diff2 \|	blob \| history