From: Samuel Just <sam.just@inktank.com>
Date: Sat, 1 Mar 2014 05:08:30 +0000 (-0800)
Subject: Merge pull request #1326 from ceph/wip-7542
X-Git-Tag: v0.78~111
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=63e34639d79a96c7f1e87703c75f213e98eaefe8;p=ceph.git

Merge pull request #1326 from ceph/wip-7542

Wip 7542

Reviewed-by: Greg Farnum <greg@inktank.com>
---

63e34639d79a96c7f1e87703c75f213e98eaefe8