From: Sage Weil <sage@redhat.com>
Date: Tue, 22 Dec 2015 22:02:43 +0000 (-0500)
Subject: Merge remote-tracking branch 'gh/jewel'
X-Git-Tag: v10.2.6~165^2^2~244
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0af7305542764d418c8ca09c337ada17a50f2674;p=ceph.git

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

0af7305542764d418c8ca09c337ada17a50f2674