Merge pull request #2822 from ceph/wip-9887

author Samuel Just <sam.just@inktank.com>

Mon, 10 Nov 2014 22:51:15 +0000 (14:51 -0800)

committer Samuel Just <sam.just@inktank.com>

Mon, 10 Nov 2014 22:51:15 +0000 (14:51 -0800)
author Samuel Just <sam.just@inktank.com>
Mon, 10 Nov 2014 22:51:15 +0000 (14:51 -0800)
committer Samuel Just <sam.just@inktank.com>
Mon, 10 Nov 2014 22:51:15 +0000 (14:51 -0800)
diff --cc src/mon/PGMonitor.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/vstart.sh
Simple merge
author	Samuel Just <sam.just@inktank.com>
	Mon, 10 Nov 2014 22:51:15 +0000 (14:51 -0800)
committer	Samuel Just <sam.just@inktank.com>
	Mon, 10 Nov 2014 22:51:15 +0000 (14:51 -0800)
		1	2
src/mon/PGMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/vstart.sh	patch \|	diff1 \|	diff2 \|	blob \| history