From: Sage Weil <sage@redhat.com>
Date: Wed, 16 Mar 2016 17:20:30 +0000 (-0400)
Subject: Merge remote-tracking branch 'gh/jewel'
X-Git-Tag: v10.1.0~62
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4b97cd7bf515aabb4474b223486291029f6644ac;p=ceph.git

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

4b97cd7bf515aabb4474b223486291029f6644ac