]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-crush-tunables'
authorSage Weil <sage@inktank.com>
Fri, 8 Jun 2012 18:18:59 +0000 (11:18 -0700)
committerSage Weil <sage@inktank.com>
Fri, 8 Jun 2012 18:18:59 +0000 (11:18 -0700)
Reviewed-by: Sam Just <sam.just@inktank.com>

Trivial merge