]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-osd'
authorSage Weil <sage@inktank.com>
Mon, 30 Jul 2012 17:49:44 +0000 (10:49 -0700)
committerSage Weil <sage@inktank.com>
Mon, 30 Jul 2012 17:49:44 +0000 (10:49 -0700)
Reviewed-by: Samuel Just <sam.just@inktank.com>

Trivial merge