From: Sage Weil <sage@redhat.com>
Date: Wed, 16 Dec 2015 15:48:15 +0000 (-0500)
Subject: Merge remote-tracking branch 'gh/jewel'
X-Git-Tag: v10.0.2~25
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=91bf56e26bf1b2b1d83f020d895230fa5d0607fc;p=ceph.git

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

91bf56e26bf1b2b1d83f020d895230fa5d0607fc