Merge remote branch 'gh/wip-cleanup'

author Sage Weil <sage@newdream.net>

Fri, 30 Dec 2011 15:42:20 +0000 (07:42 -0800)

committer Sage Weil <sage@newdream.net>

Fri, 30 Dec 2011 15:42:20 +0000 (07:42 -0800)
author Sage Weil <sage@newdream.net>
Fri, 30 Dec 2011 15:42:20 +0000 (07:42 -0800)
committer Sage Weil <sage@newdream.net>
Fri, 30 Dec 2011 15:42:20 +0000 (07:42 -0800)
diff --cc src/librados.cc
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Fri, 30 Dec 2011 15:42:20 +0000 (07:42 -0800)
committer	Sage Weil <sage@newdream.net>
	Fri, 30 Dec 2011 15:42:20 +0000 (07:42 -0800)
		1	2
src/librados.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history