From: Samuel Just <sjust@redhat.com>
Date: Fri, 8 Jan 2016 19:41:55 +0000 (-0800)
Subject: Merge pull request #7147 from athanatos/wip-14247
X-Git-Tag: v10.0.2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=20ac64f139263cf10db6dd1601c751031dfead31;p=ceph.git

Merge pull request #7147 from athanatos/wip-14247

Wip 14247

Reviewed-by: Kefu Chai <kchai@redhat.com>
---

20ac64f139263cf10db6dd1601c751031dfead31