From: Sage Weil <sage@redhat.com>
Date: Mon, 2 May 2016 00:57:30 +0000 (-0400)
Subject: Merge remote-tracking branch 'gh/jewel'
X-Git-Tag: v10.2.6~165^2^2~76
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fdd9c00c0b78d1f8e355358c59fef13592ac999f;p=ceph.git

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

fdd9c00c0b78d1f8e355358c59fef13592ac999f