]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'rbd-fiemap' into unstable
authorSage Weil <sage@newdream.net>
Tue, 9 Nov 2010 22:50:24 +0000 (14:50 -0800)
committerSage Weil <sage@newdream.net>
Tue, 9 Nov 2010 22:50:24 +0000 (14:50 -0800)

Trivial merge