From: Sage Weil <sage@redhat.com>
Date: Thu, 29 Jan 2015 23:06:11 +0000 (-0800)
Subject: Merge pull request #3125 from ceph/wip-10194-master
X-Git-Tag: v0.93~157
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=243860b5e413c23ea642d368a8f771e6c484d1eb;p=ceph.git

Merge pull request #3125 from ceph/wip-10194-master

Wip 10194 master

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

243860b5e413c23ea642d368a8f771e6c484d1eb