Merge pull request #7087 from H3C/wip-yrf-cephdf

author Sage Weil <sage@redhat.com>

Fri, 15 Jan 2016 00:00:16 +0000 (19:00 -0500)

committer Sage Weil <sage@redhat.com>

Fri, 15 Jan 2016 00:00:16 +0000 (19:00 -0500)
author Sage Weil <sage@redhat.com>
Fri, 15 Jan 2016 00:00:16 +0000 (19:00 -0500)
committer Sage Weil <sage@redhat.com>
Fri, 15 Jan 2016 00:00:16 +0000 (19:00 -0500)
diff --cc qa/workunits/cephtool/test.sh
Simple merge
diff --cc src/mon/PGMonitor.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Fri, 15 Jan 2016 00:00:16 +0000 (19:00 -0500)
committer	Sage Weil <sage@redhat.com>
	Fri, 15 Jan 2016 00:00:16 +0000 (19:00 -0500)
		1	2
qa/workunits/cephtool/test.sh	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/PGMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history