Merge remote-tracking branch 'gh/wip-mon-encoding'

author Sage Weil <sage@inktank.com>

Wed, 16 May 2012 23:55:04 +0000 (16:55 -0700)

committer Sage Weil <sage@inktank.com>

Wed, 16 May 2012 23:55:04 +0000 (16:55 -0700)
author Sage Weil <sage@inktank.com>
Wed, 16 May 2012 23:55:04 +0000 (16:55 -0700)
committer Sage Weil <sage@inktank.com>
Wed, 16 May 2012 23:55:04 +0000 (16:55 -0700)
diff --cc src/mon/Monitor.cc
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/osd/OSDMap.h
Simple merge
author	Sage Weil <sage@inktank.com>
	Wed, 16 May 2012 23:55:04 +0000 (16:55 -0700)
committer	Sage Weil <sage@inktank.com>
	Wed, 16 May 2012 23:55:04 +0000 (16:55 -0700)
		1	2
src/mon/Monitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSDMap.h	patch \|	diff1 \|	diff2 \|	blob \| history