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

Merge pull request #2027 from athanatos/wip-7999-master

Wip 7999 master

Fixes: #7999
Backport: Firefly
Reviewed-by: Sage Weil <sage@inktank.com>
Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
---

830940bf242a73403ec1882a489e31f7694b7f7e