Merge remote-tracking branch 'gh/infernalis'

author Sage Weil <sage@redhat.com>

Wed, 14 Oct 2015 13:05:33 +0000 (09:05 -0400)

committer Sage Weil <sage@redhat.com>

Wed, 14 Oct 2015 13:05:33 +0000 (09:05 -0400)
author Sage Weil <sage@redhat.com>
Wed, 14 Oct 2015 13:05:33 +0000 (09:05 -0400)
committer Sage Weil <sage@redhat.com>
Wed, 14 Oct 2015 13:05:33 +0000 (09:05 -0400)
diff --cc doc/release-notes.rst
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/ReplicatedPG.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Wed, 14 Oct 2015 13:05:33 +0000 (09:05 -0400)
committer	Sage Weil <sage@redhat.com>
	Wed, 14 Oct 2015 13:05:33 +0000 (09:05 -0400)
		1	2
doc/release-notes.rst	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history