From: Sage Weil <sage@inktank.com>
Date: Sun, 21 Oct 2012 16:01:33 +0000 (-0700)
Subject: Merge branch 'wip-testrados'
X-Git-Tag: v0.55~238
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ddde1c8f6a1ce3b5860e60f55c132eee372d4c83;p=ceph.git

Merge branch 'wip-testrados'

Lightly-reviewed-by: Josh Durgin <josh.durgin@inktank.com>
---

ddde1c8f6a1ce3b5860e60f55c132eee372d4c83