From: Sage Weil <sage@inktank.com>
Date: Tue, 3 Jul 2012 23:49:29 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/wip-crush'
X-Git-Tag: v0.49~35
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f6cdd8522397cac18a2eb485d6e38a1cf6d2872d;p=ceph.git

Merge remote-tracking branch 'gh/wip-crush'
---

f6cdd8522397cac18a2eb485d6e38a1cf6d2872d