From: David Zafman <dzafman@redhat.com>
Date: Fri, 2 Jun 2017 16:54:45 +0000 (-0700)
Subject: Merge pull request #15421 from dzafman/wip-20125
X-Git-Tag: v11.2.1~121
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=358081d27a9b2c39e9daed10244819df5291da48;p=ceph.git

Merge pull request #15421 from dzafman/wip-20125

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

358081d27a9b2c39e9daed10244819df5291da48