Merge remote branch 'vapre/wip-pgid'

author Sage Weil <sage@newdream.net>

Mon, 29 Aug 2011 20:39:12 +0000 (13:39 -0700)

committer Sage Weil <sage@newdream.net>

Mon, 29 Aug 2011 20:39:12 +0000 (13:39 -0700)
author Sage Weil <sage@newdream.net>
Mon, 29 Aug 2011 20:39:12 +0000 (13:39 -0700)
committer Sage Weil <sage@newdream.net>
Mon, 29 Aug 2011 20:39:12 +0000 (13:39 -0700)
diff --cc src/client/Client.cc
Simple merge
diff --cc src/client/Client.h
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Mon, 29 Aug 2011 20:39:12 +0000 (13:39 -0700)
committer	Sage Weil <sage@newdream.net>
	Mon, 29 Aug 2011 20:39:12 +0000 (13:39 -0700)
		1	2
src/client/Client.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/client/Client.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history