From: David Zafman <david.zafman@inktank.com>
Date: Tue, 30 Apr 2013 17:52:23 +0000 (-0700)
Subject: Merge branch 'wip-2209' into next
X-Git-Tag: v0.61~34
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=53a2c64ff1807c8d863dcd8c05571f4b3ed9c608;p=ceph.git

Merge branch 'wip-2209' into next

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

53a2c64ff1807c8d863dcd8c05571f4b3ed9c608