From: Sage Weil <sage@redhat.com>
Date: Mon, 8 Feb 2016 22:26:13 +0000 (-0500)
Subject: Merge remote-tracking branch 'gh/jewel'
X-Git-Tag: v10.0.4~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f22b671434f0f3640244d05d2f72fcc0eb3696f3;p=ceph.git

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

f22b671434f0f3640244d05d2f72fcc0eb3696f3