From: Sage Weil <sage@redhat.com>
Date: Thu, 28 Aug 2014 19:40:16 +0000 (-0700)
Subject: Merge pull request #2348 from athanatos/wip-9054
X-Git-Tag: v0.85~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2d9b1560e3bc4718bb744c8d385822d6199b7880;p=ceph.git

Merge pull request #2348 from athanatos/wip-9054

Wip 9054

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

2d9b1560e3bc4718bb744c8d385822d6199b7880