From: Sage Weil <sage@redhat.com>
Date: Wed, 23 Dec 2015 22:07:41 +0000 (-0500)
Subject: Merge remote-tracking branch 'gh/jewel'
X-Git-Tag: v10.2.6~165^2^2~242
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7f446f1a2d1dc8fe8d7a0c3cd9eae6e2c2d11faa;p=ceph.git

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

7f446f1a2d1dc8fe8d7a0c3cd9eae6e2c2d11faa