]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/wip_coverity_osd'
authorSage Weil <sage@inktank.com>
Thu, 27 Sep 2012 01:43:12 +0000 (18:43 -0700)
committerSage Weil <sage@inktank.com>
Thu, 27 Sep 2012 01:43:12 +0000 (18:43 -0700)
Conflicts:
src/librbd/internal.cc

Reviewed-by: Sage Weil <sage@inktank.com>

Trivial merge