]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/wip_osd_threading'
authorSage Weil <sage@inktank.com>
Fri, 6 Jul 2012 00:20:14 +0000 (17:20 -0700)
committerSage Weil <sage@inktank.com>
Fri, 6 Jul 2012 00:20:14 +0000 (17:20 -0700)

Trivial merge