From: Sage Weil <sage@inktank.com>
Date: Sun, 23 Feb 2014 22:48:10 +0000 (-0800)
Subject: Merge pull request #1306 from ceph/wip-7512
X-Git-Tag: v0.78~124
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dcb9946b1a2170f2ce99b0008d202bcf0a2fcdac;p=ceph.git

Merge pull request #1306 from ceph/wip-7512

wip-7512

Reviewed-by: Sage Weil <sage@inktank.com>
---

dcb9946b1a2170f2ce99b0008d202bcf0a2fcdac