From: Sage Weil <sage@newdream.net>
Date: Wed, 7 Apr 2010 22:29:38 +0000 (-0700)
Subject: Merge branch 'rbd' into unstable
X-Git-Tag: v0.20~100
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6e28eb3d6ead2c01f5d9230bcce10591ea684d25;p=ceph.git

Merge branch 'rbd' into unstable
---

6e28eb3d6ead2c01f5d9230bcce10591ea684d25