]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'osd_lost_objects' into unstable
authorSage Weil <sage@newdream.net>
Wed, 6 Oct 2010 16:45:16 +0000 (09:45 -0700)
committerSage Weil <sage@newdream.net>
Wed, 6 Oct 2010 16:45:16 +0000 (09:45 -0700)

Trivial merge