Merge pull request #6052 from liewegas/wip-13098

author Sage Weil <sage@redhat.com>

Sat, 26 Sep 2015 05:22:39 +0000 (01:22 -0400)

committer Sage Weil <sage@redhat.com>

Sat, 26 Sep 2015 05:22:39 +0000 (01:22 -0400)
author Sage Weil <sage@redhat.com>
Sat, 26 Sep 2015 05:22:39 +0000 (01:22 -0400)
committer Sage Weil <sage@redhat.com>
Sat, 26 Sep 2015 05:22:39 +0000 (01:22 -0400)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge
diff --cc src/osd/ReplicatedPG.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Sat, 26 Sep 2015 05:22:39 +0000 (01:22 -0400)
committer	Sage Weil <sage@redhat.com>
	Sat, 26 Sep 2015 05:22:39 +0000 (01:22 -0400)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history