From: Sage Weil <sage@redhat.com>
Date: Tue, 23 Sep 2014 18:40:13 +0000 (-0700)
Subject: Merge pull request #2561 from athanatos/wip-9293
X-Git-Tag: v0.86~34
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f711819df518d33ff3d5909813ea004d8657f057;p=ceph.git

Merge pull request #2561 from athanatos/wip-9293

Wip 9293

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

f711819df518d33ff3d5909813ea004d8657f057