Merge remote-tracking branch 'gh/infernalis'

author Sage Weil <sage@redhat.com>

Thu, 1 Oct 2015 15:51:50 +0000 (11:51 -0400)

committer Sage Weil <sage@redhat.com>

Thu, 1 Oct 2015 15:51:50 +0000 (11:51 -0400)
author Sage Weil <sage@redhat.com>
Thu, 1 Oct 2015 15:51:50 +0000 (11:51 -0400)
committer Sage Weil <sage@redhat.com>
Thu, 1 Oct 2015 15:51:50 +0000 (11:51 -0400)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/ReplicatedPG.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Thu, 1 Oct 2015 15:51:50 +0000 (11:51 -0400)
committer	Sage Weil <sage@redhat.com>
	Thu, 1 Oct 2015 15:51:50 +0000 (11:51 -0400)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history