Merge branch 'master' of ssh://ceph.newdream.net/git/ceph into rados

author sage <sage@vapre.localdomain>

Fri, 18 Jan 2008 00:34:48 +0000 (16:34 -0800)

committer sage <sage@vapre.localdomain>

Fri, 18 Jan 2008 00:34:48 +0000 (16:34 -0800)
author sage <sage@vapre.localdomain>
Fri, 18 Jan 2008 00:34:48 +0000 (16:34 -0800)
committer sage <sage@vapre.localdomain>
Fri, 18 Jan 2008 00:34:48 +0000 (16:34 -0800)
diff --cc src/Makefile
Simple merge
diff --cc src/mon/MonMap.h
Simple merge
diff --cc src/mon/PGMap.h
Simple merge
author	sage <sage@vapre.localdomain>
	Fri, 18 Jan 2008 00:34:48 +0000 (16:34 -0800)
committer	sage <sage@vapre.localdomain>
	Fri, 18 Jan 2008 00:34:48 +0000 (16:34 -0800)
		1	2
src/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/MonMap.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/PGMap.h	patch \|	diff1 \|	diff2 \|	blob \| history