From: Sage Weil <sage@inktank.com>
Date: Wed, 29 May 2013 03:44:48 +0000 (-0700)
Subject: Merge branch 'wip-5172'
X-Git-Tag: v0.64~42
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b6be785775442af1999b2543bd07a0d28391dbc5;p=ceph.git

Merge branch 'wip-5172'

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

b6be785775442af1999b2543bd07a0d28391dbc5