From: Sage Weil <sage@inktank.com>
Date: Thu, 2 May 2013 17:18:39 +0000 (-0700)
Subject: Merge branch 'wip-paranoid' into next
X-Git-Tag: v0.61~17
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=65d61f7a8381f78138bd529d0fbcf8ecbad385df;p=ceph.git

Merge branch 'wip-paranoid' into next
---

65d61f7a8381f78138bd529d0fbcf8ecbad385df