From: Sage Weil <sage@redhat.com>
Date: Mon, 11 Apr 2016 12:38:27 +0000 (-0400)
Subject: Merge remote-tracking branch 'gh/jewel'
X-Git-Tag: v10.1.2~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4e2a29ad4ed7f07039c71f00e168fc39acf1451d;p=ceph.git

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

4e2a29ad4ed7f07039c71f00e168fc39acf1451d