From: David Zafman <david.zafman@inktank.com>
Date: Fri, 11 Apr 2014 15:33:45 +0000 (-0700)
Subject: Merge pull request #1635 from ceph/wip-7437
X-Git-Tag: v0.80-rc1~59
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ec4a6ce0c2d175a3bf82059ff992f20ce18bb80e;p=ceph.git

Merge pull request #1635 from ceph/wip-7437

Reviewed-by: Sage Weil <sage@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
---

ec4a6ce0c2d175a3bf82059ff992f20ce18bb80e