]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-osd-down-out'
authorSage Weil <sage@inktank.com>
Tue, 29 Jan 2013 01:22:25 +0000 (17:22 -0800)
committerSage Weil <sage@inktank.com>
Tue, 29 Jan 2013 01:22:25 +0000 (17:22 -0800)
Reviewed-by: Samuel Just <sam.just@inktank.com>

Trivial merge