From: Sage Weil <sage@newdream.net>
Date: Thu, 31 Jul 2008 20:58:01 +0000 (-0700)
Subject: Merge branch 'unstable' into snap
X-Git-Tag: v0.4~352
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=af71a636bafd0e40213948d49b955db9a15a9dc0;p=ceph.git

Merge branch 'unstable' into snap

Conflicts:

	src/mon/ClientMonitor.cc
	src/mon/MDSMonitor.cc
	src/mon/OSDMonitor.cc
	src/mon/PGMonitor.cc
---

af71a636bafd0e40213948d49b955db9a15a9dc0