]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-osd-fixes' into next
authorSage Weil <sage@inktank.com>
Fri, 25 Oct 2013 19:56:02 +0000 (12:56 -0700)
committerSage Weil <sage@inktank.com>
Fri, 25 Oct 2013 19:56:02 +0000 (12:56 -0700)
Reviewed-by: Samuel Just <sam.just@inktank.com>

Trivial merge