From: Samuel Just <sam.just@inktank.com>
Date: Mon, 30 Jun 2014 18:12:03 +0000 (-0700)
Subject: Merge pull request #2026 from athanatos/wip-8438-master
X-Git-Tag: v0.84~171
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c5b8d8105d965da852c79add607b69d5ae79a4d4;p=ceph.git

Merge pull request #2026 from athanatos/wip-8438-master

Wip 8438 master

Fixes: #8438
Backport: Firefly
Reviewed-by: Sage Weil <sage@inktank.com>
---

c5b8d8105d965da852c79add607b69d5ae79a4d4