Merge pull request #1933 from ceph/wip-8556

author Sage Weil <sage@inktank.com>

Thu, 12 Jun 2014 23:45:31 +0000 (16:45 -0700)

committer Sage Weil <sage@inktank.com>

Thu, 12 Jun 2014 23:45:31 +0000 (16:45 -0700)
author Sage Weil <sage@inktank.com>
Thu, 12 Jun 2014 23:45:31 +0000 (16:45 -0700)
committer Sage Weil <sage@inktank.com>
Thu, 12 Jun 2014 23:45:31 +0000 (16:45 -0700)
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/PG.cc
Simple merge
author	Sage Weil <sage@inktank.com>
	Thu, 12 Jun 2014 23:45:31 +0000 (16:45 -0700)
committer	Sage Weil <sage@inktank.com>
	Thu, 12 Jun 2014 23:45:31 +0000 (16:45 -0700)
		1	2
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history