From: Sage Weil <sage@redhat.com>
Date: Thu, 22 Jan 2015 19:19:47 +0000 (-0800)
Subject: Merge pull request #3460 from athanatos/wip-10524
X-Git-Tag: v0.93~209
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=235d97a66a8b92b832d23a134c7efd20eaa07769;p=ceph.git

Merge pull request #3460 from athanatos/wip-10524

Wip 10524

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

235d97a66a8b92b832d23a134c7efd20eaa07769