From: Sage Weil <sage@redhat.com>
Date: Thu, 21 Apr 2016 11:39:36 +0000 (-0400)
Subject: Merge remote-tracking branch 'gh/jewel'
X-Git-Tag: v11.0.0~886
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b7afa78e22d41c82e5cd48529bbe55ad435f5d36;p=ceph.git

Merge remote-tracking branch 'gh/jewel'
---

b7afa78e22d41c82e5cd48529bbe55ad435f5d36