From: jtlayton <jlayton@redhat.com>
Date: Tue, 20 Dec 2016 20:36:39 +0000 (-0500)
Subject: Merge branch 'jewel' into wip-18308-jewel
X-Git-Tag: v10.2.6~163^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F12591%2Fhead;p=ceph.git

Merge branch 'jewel' into wip-18308-jewel
---

5799d5fdba9b890634a9b3d6fa038dfde3818779