From: Sage Weil <sage@newdream.net>
Date: Tue, 9 Feb 2010 16:15:31 +0000 (-0800)
Subject: Merge branch 'unstable' into filestore
X-Git-Tag: v0.20~431^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3f429e005e4a7c24aaadbc7c6acb33bf7308fc2e;p=ceph.git

Merge branch 'unstable' into filestore
---

3f429e005e4a7c24aaadbc7c6acb33bf7308fc2e