]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'osd_recovery' into next
authorSage Weil <sage.weil@dreamhost.com>
Fri, 4 Mar 2011 22:19:40 +0000 (14:19 -0800)
committerSage Weil <sage.weil@dreamhost.com>
Fri, 4 Mar 2011 22:19:40 +0000 (14:19 -0800)

Trivial merge