From: Sage Weil <sage@redhat.com>
Date: Sun, 3 Apr 2016 18:28:23 +0000 (-0400)
Subject: Merge remote-tracking branch 'gh/jewel'
X-Git-Tag: v10.1.1~25
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=370e4f773a5347a2d0c0493ccf3dc55909b75bce;p=ceph.git

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

370e4f773a5347a2d0c0493ccf3dc55909b75bce