From: Sage Weil <sage@redhat.com>
Date: Sun, 3 Apr 2016 18:00:05 +0000 (-0400)
Subject: Merge remote-tracking branch 'gh/jewel'
X-Git-Tag: v10.2.6~165^2^2~117
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5f59b48d39cf7a4ec593d9421989f666a549ccc1;p=ceph.git

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

5f59b48d39cf7a4ec593d9421989f666a549ccc1