]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-rbd-wt'
authorSage Weil <sage@newdream.net>
Tue, 8 May 2012 23:04:12 +0000 (16:04 -0700)
committerSage Weil <sage@newdream.net>
Tue, 8 May 2012 23:04:12 +0000 (16:04 -0700)
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>

Trivial merge