From: Sage Weil <sage@inktank.com>
Date: Thu, 27 Mar 2014 23:39:36 +0000 (-0700)
Subject: Merge branch 'wip-7875'
X-Git-Tag: v0.79~73
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7a1990b66ec29f4f3e1659df813ef09831a17cfe;p=ceph.git

Merge branch 'wip-7875'

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

7a1990b66ec29f4f3e1659df813ef09831a17cfe