From: Sage Weil <sage@redhat.com>
Date: Tue, 1 Dec 2015 13:51:48 +0000 (-0500)
Subject: Merge remote-tracking branch 'gh/jewel'
X-Git-Tag: v10.0.2~144
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=48abbe708146889a064a346848cc496cc245108d;p=ceph.git

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

48abbe708146889a064a346848cc496cc245108d