]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'recovery' into unstable
authorSage Weil <sage@newdream.net>
Mon, 27 Oct 2008 21:02:46 +0000 (14:02 -0700)
committerSage Weil <sage@newdream.net>
Mon, 27 Oct 2008 21:02:46 +0000 (14:02 -0700)

Trivial merge