From: Sage Weil <sage@redhat.com>
Date: Wed, 3 Feb 2016 14:46:47 +0000 (-0500)
Subject: Merge remote-tracking branch 'gh/jewel'
X-Git-Tag: v10.0.4~68
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2aeadc9acf1b0f2e030f36fe0ea2854779f4c4ae;p=ceph.git

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

2aeadc9acf1b0f2e030f36fe0ea2854779f4c4ae