From: Sage Weil <sage@inktank.com>
Date: Mon, 25 Mar 2013 23:29:56 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/wip-crush'
X-Git-Tag: v0.62~177
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ffe8235f3469503ca415c85d83567a01bd261618;p=ceph.git

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

The non-crush bits
Reviewed-by: Dan Mick <dan.mick@inktank.com>
---

ffe8235f3469503ca415c85d83567a01bd261618