Merge branch 'wip-msgr'

author Sage Weil <sage@inktank.com>

Thu, 23 Aug 2012 20:29:10 +0000 (13:29 -0700)

committer Sage Weil <sage@inktank.com>

Thu, 23 Aug 2012 20:29:10 +0000 (13:29 -0700)
author Sage Weil <sage@inktank.com>
Thu, 23 Aug 2012 20:29:10 +0000 (13:29 -0700)
committer Sage Weil <sage@inktank.com>
Thu, 23 Aug 2012 20:29:10 +0000 (13:29 -0700)
diff --cc src/ceph_mon.cc
Simple merge
diff --cc src/msg/Messenger.h
Simple merge
diff --cc src/msg/Pipe.cc
Simple merge
author	Sage Weil <sage@inktank.com>
	Thu, 23 Aug 2012 20:29:10 +0000 (13:29 -0700)
committer	Sage Weil <sage@inktank.com>
	Thu, 23 Aug 2012 20:29:10 +0000 (13:29 -0700)
		1	2
src/ceph_mon.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/msg/Messenger.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/msg/Pipe.cc	patch \|	diff1 \|	diff2 \|	blob \| history