]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/wip-rbd-flatten-deadlock'
authorSage Weil <sage@inktank.com>
Fri, 22 Feb 2013 22:23:45 +0000 (14:23 -0800)
committerSage Weil <sage@inktank.com>
Fri, 22 Feb 2013 22:23:45 +0000 (14:23 -0800)
Reviewed-by: Sage Weil <sage@inktank.com>

Trivial merge