]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/wip-recovery-stats-b'
authorSage Weil <sage@inktank.com>
Wed, 30 Jan 2013 00:34:21 +0000 (16:34 -0800)
committerSage Weil <sage@inktank.com>
Wed, 30 Jan 2013 00:34:21 +0000 (16:34 -0800)
Reviewed-by: Samuel Just <sam.just@inktank.com>

Trivial merge