From: Sage Weil <sage@redhat.com>
Date: Fri, 25 Mar 2016 19:49:23 +0000 (-0400)
Subject: Merge remote-tracking branch 'gh/jewel'
X-Git-Tag: v10.1.1~105
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a0e5aa5c8aafda8ac6968890fa50a813c53f7adc;p=ceph.git

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

a0e5aa5c8aafda8ac6968890fa50a813c53f7adc