From: Samuel Just <sjust@redhat.com>
Date: Thu, 15 Dec 2016 00:07:27 +0000 (-0800)
Subject: Merge pull request #12493 from athanatos/wip-18113-qa
X-Git-Tag: v11.1.1~58
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=96d30395f751a4aa87a6f74b5e56551f93617850;p=ceph.git

Merge pull request #12493 from athanatos/wip-18113-qa

Wip 18113 qa
---

96d30395f751a4aa87a6f74b5e56551f93617850