]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote branch 'origin/wip_librbd_locking'
authorSage Weil <sage.weil@dreamhost.com>
Mon, 6 Jun 2011 17:58:32 +0000 (10:58 -0700)
committerSage Weil <sage.weil@dreamhost.com>
Mon, 6 Jun 2011 17:58:32 +0000 (10:58 -0700)

Trivial merge