From: Sage Weil <sage@redhat.com>
Date: Thu, 3 Mar 2016 18:35:13 +0000 (-0500)
Subject: Merge remote-tracking branch 'gh/jewel'
X-Git-Tag: v10.1.0~233
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=be3544f162164462f47059fc35eee4ea3f282ad9;p=ceph.git

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

be3544f162164462f47059fc35eee4ea3f282ad9