Merge branch 'infernalis'

author Sage Weil <sage@redhat.com>

Tue, 13 Oct 2015 12:24:22 +0000 (08:24 -0400)

committer Sage Weil <sage@redhat.com>

Tue, 13 Oct 2015 12:24:22 +0000 (08:24 -0400)
author Sage Weil <sage@redhat.com>
Tue, 13 Oct 2015 12:24:22 +0000 (08:24 -0400)
committer Sage Weil <sage@redhat.com>
Tue, 13 Oct 2015 12:24:22 +0000 (08:24 -0400)
diff --cc doc/release-notes.rst
Simple merge
diff --cc src/mds/MDSRank.cc
Simple merge
diff --cc src/osd/ReplicatedPG.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Tue, 13 Oct 2015 12:24:22 +0000 (08:24 -0400)
committer	Sage Weil <sage@redhat.com>
	Tue, 13 Oct 2015 12:24:22 +0000 (08:24 -0400)
		1	2
doc/release-notes.rst	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/MDSRank.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history