From: Sage Weil <sage.weil@dreamhost.com>
Date: Mon, 6 Jun 2011 17:58:32 +0000 (-0700)
Subject: Merge remote branch 'origin/wip_librbd_locking'
X-Git-Tag: v0.30~119
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=73257a0d4b9e3b25d0b20fbe5a47a730f74362db;p=ceph.git

Merge remote branch 'origin/wip_librbd_locking'
---

73257a0d4b9e3b25d0b20fbe5a47a730f74362db