From: Sage Weil <sage@redhat.com>
Date: Mon, 11 May 2015 18:12:24 +0000 (-0700)
Subject: Merge pull request #4525 from athanatos/wip-11358
X-Git-Tag: v9.0.2~187
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6817d03b37a60febe7a661c6b3a059c7bf1cccb0;p=ceph.git

Merge pull request #4525 from athanatos/wip-11358

Wip 11358

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

6817d03b37a60febe7a661c6b3a059c7bf1cccb0