From: Sage Weil <sage@redhat.com>
Date: Mon, 28 Mar 2016 16:39:11 +0000 (-0400)
Subject: Merge remote-tracking branch 'gh/jewel'
X-Git-Tag: v10.2.6~165^2^2~129
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=826aaad0bdcb2167e98ca90cd20ea335939c0157;p=ceph.git

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

826aaad0bdcb2167e98ca90cd20ea335939c0157