]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/wip-osd-caps'
authorSage Weil <sage@inktank.com>
Thu, 27 Sep 2012 23:34:03 +0000 (16:34 -0700)
committerSage Weil <sage@inktank.com>
Thu, 27 Sep 2012 23:34:03 +0000 (16:34 -0700)
Reviewed-by: Sage Weil <sage@inktank.com>

Trivial merge