Merge branch 'wip-mon-osdmap-trim'

author Sage Weil <sage@inktank.com>

Tue, 9 Jul 2013 20:43:25 +0000 (13:43 -0700)

committer Sage Weil <sage@inktank.com>

Tue, 9 Jul 2013 20:43:25 +0000 (13:43 -0700)
author Sage Weil <sage@inktank.com>
Tue, 9 Jul 2013 20:43:25 +0000 (13:43 -0700)
committer Sage Weil <sage@inktank.com>
Tue, 9 Jul 2013 20:43:25 +0000 (13:43 -0700)
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/mon/PGMonitor.cc
Simple merge
diff --cc src/osd/osd_types.cc
Simple merge
author	Sage Weil <sage@inktank.com>
	Tue, 9 Jul 2013 20:43:25 +0000 (13:43 -0700)
committer	Sage Weil <sage@inktank.com>
	Tue, 9 Jul 2013 20:43:25 +0000 (13:43 -0700)
		1	2
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/PGMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.cc	patch \|	diff1 \|	diff2 \|	blob \| history