From: Sage Weil <sage@redhat.com>
Date: Tue, 29 Mar 2016 12:46:04 +0000 (-0400)
Subject: Merge remote-tracking branch 'gh/jewel'
X-Git-Tag: v10.2.6~165^2^2~127
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d303c0db75c13c2891e40d09bdc545968bcb7fe9;p=ceph.git

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

d303c0db75c13c2891e40d09bdc545968bcb7fe9