From: Sage Weil <sage@inktank.com>
Date: Fri, 8 Jun 2012 18:18:59 +0000 (-0700)
Subject: Merge branch 'wip-crush-tunables'
X-Git-Tag: v0.48argonaut~97
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3876dbfdd7e193373e103b41dcf460d6f3723b25;p=ceph.git

Merge branch 'wip-crush-tunables'

Reviewed-by: Sam Just <sam.just@inktank.com>
---

3876dbfdd7e193373e103b41dcf460d6f3723b25