Merge branch 'wip-msgr'

author Sage Weil <sage@inktank.com>

Tue, 3 Jul 2012 00:54:35 +0000 (17:54 -0700)

committer Sage Weil <sage@inktank.com>

Tue, 3 Jul 2012 00:54:35 +0000 (17:54 -0700)
author Sage Weil <sage@inktank.com>
Tue, 3 Jul 2012 00:54:35 +0000 (17:54 -0700)
committer Sage Weil <sage@inktank.com>
Tue, 3 Jul 2012 00:54:35 +0000 (17:54 -0700)
diff --cc doc/control.rst
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/os/FileStore.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Sage Weil <sage@inktank.com>
	Tue, 3 Jul 2012 00:54:35 +0000 (17:54 -0700)
committer	Sage Weil <sage@inktank.com>
	Tue, 3 Jul 2012 00:54:35 +0000 (17:54 -0700)
		1	2
doc/control.rst	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/FileStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history